[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[bfulgham at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b592cdd6fc2e9c623a4887aa813e2049ea286536
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 23:40:56 2010 +0000

    Unreviewed build correction.
    
    * wtf/Platform.h: Make sure ACCELERATED_COMPOSITING is
    turned off in the WinCairo port.  This isn't supported (yet.)
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70726 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ceb74c5..42c5f7a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-27  Brent Fulgham  <bfulgham at webkit.org>
+
+        Unreviewed build correction.
+
+        * wtf/Platform.h: Make sure ACCELERATED_COMPOSITING is
+        turned off in the WinCairo port.  This isn't supported (yet.)
+
 2010-10-27  Chris Rogers  <crogers at google.com>
 
         Reviewed by Chris Marrin.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 79f194a..3b3acf4 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -1065,7 +1065,7 @@
 #endif
 
 /* Accelerated compositing */
-#if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE))
+#if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) &&!defined(WIN_CAIRO))
 #define WTF_USE_ACCELERATED_COMPOSITING 1
 #endif
 

-- 
WebKit Debian packaging