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

[simon.fraser at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e9f108ad53e1b712f2900a3379a06cfacf1e0959
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 22:05:53 2010 +0000

    2010-11-09  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Darin Adler, Dan Bernstein.
    
            <rdar://problem/8360145> Pages using accelerated compositing missing content on Windows
    
            Disable accelerated compositing on Windows until we have cross-process
            rendering implemented.
    
            * WebProcess/WebPage/WebPage.cpp:
            (WebKit::WebPage::updatePreferences):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71676 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d7a8350..5511818 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-09  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Darin Adler, Dan Bernstein.
+
+        <rdar://problem/8360145> Pages using accelerated compositing missing content on Windows
+
+        Disable accelerated compositing on Windows until we have cross-process
+        rendering implemented.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::updatePreferences):
+
 2010-11-09  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 1153c99..b5fdea7 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -809,7 +809,12 @@ void WebPage::updatePreferences(const WebPreferencesStore& store)
     settings->setSerifFontFamily(store.serifFontFamily);
     settings->setJavaScriptCanOpenWindowsAutomatically(true);
 
+#if PLATFORM(WIN)
+    // Temporarily turn off accelerated compositing until we have a good solution for rendering it.
+    settings->setAcceleratedCompositingEnabled(false);
+#else
     settings->setAcceleratedCompositingEnabled(store.acceleratedCompositingEnabled);
+#endif
     settings->setShowDebugBorders(store.compositingBordersVisible);
     settings->setShowRepaintCounter(store.compositingRepaintCountersVisible);
     

-- 
WebKit Debian packaging