[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 823bfaf1bf3aeb0a429e13da0028dee809b8e567
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 1 19:01:07 2009 +0000

    2009-12-01  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Eric Seidel.
    
            PLATFORM(CAIRO) should be defined by WIN_CAIRO define
            https://bugs.webkit.org/show_bug.cgi?id=22250
    
            * wtf/Platform.h: Remove WTF_PLATFORM_CAIRO as it is
            already define in config.h
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51551 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index baf25ed..d362291 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-01  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        PLATFORM(CAIRO) should be defined by WIN_CAIRO define
+        https://bugs.webkit.org/show_bug.cgi?id=22250
+
+        * wtf/Platform.h: Remove WTF_PLATFORM_CAIRO as it is 
+        already define in config.h
+
 2009-11-30  Gavin Barraclough  <barraclough at apple.com>
 
         Windows Build fix.  Reviewed by NOBODY.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index cc704fe..c1b32b2 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -205,12 +205,6 @@
 #endif
 #endif
 
-/* Makes PLATFORM(WIN) default to PLATFORM(CAIRO) */
-/* FIXME: This should be changed from a blacklist to a whitelist */
-#if !PLATFORM(MAC) && !PLATFORM(QT) && !PLATFORM(WX) && !PLATFORM(CHROMIUM) && !PLATFORM(WINCE) && !PLATFORM(HAIKU) && !PLATFORM(ANDROID)
-#define WTF_PLATFORM_CAIRO 1
-#endif
-
 /* CPU */
 
 /* PLATFORM(PPC) */

-- 
WebKit Debian packaging