[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 35993d274ad042912eaac19430f06b4567b08110
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 29 23:19:45 2009 +0000

    2009-12-29  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Maciej Stachowiak.
    
            PLATFORM(CAIRO) should be defined by WIN_CAIRO define
            https://bugs.webkit.org/show_bug.cgi?id=22250
    
            * wtf/Platform.h: Define WTF_PLATFORM_CAIRO for GTK port only
            For the WinCairo port WTF_PLATFORM_CAIRO is already defined in config.h
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52637 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 0b5fe78..42a3956 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-29  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        PLATFORM(CAIRO) should be defined by WIN_CAIRO define
+        https://bugs.webkit.org/show_bug.cgi?id=22250
+
+        * wtf/Platform.h: Define WTF_PLATFORM_CAIRO for GTK port only
+        For the WinCairo port WTF_PLATFORM_CAIRO is already defined in config.h
+
 2009-12-28  Shu Chang  <Chang.Shu at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index aab101d..95eb63a 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -210,9 +210,7 @@
 #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)
+#if PLATFORM(GTK)
 #define WTF_PLATFORM_CAIRO 1
 #endif
 

-- 
WebKit Debian packaging