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

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 197accca6b580003f88d6ef0123686334c1ab7f6
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 1 21:17:06 2009 +0000

    Revert 51551 because it broke GTK+.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51555 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d362291..1af4f50 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,12 +1,8 @@
-2009-12-01  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+2009-12-01  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
 
-        Reviewed by Eric Seidel.
-
-        PLATFORM(CAIRO) should be defined by WIN_CAIRO define
-        https://bugs.webkit.org/show_bug.cgi?id=22250
+        Revert 51551 because it broke GTK+.
 
-        * wtf/Platform.h: Remove WTF_PLATFORM_CAIRO as it is 
-        already define in config.h
+        * wtf/Platform.h:
 
 2009-11-30  Gavin Barraclough  <barraclough at apple.com>
 
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index c1b32b2..cc704fe 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -205,6 +205,12 @@
 #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