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

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit b936c101898bb30b39b17bde6017cc7366575266
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 20 05:48:04 2010 +0000

    2010-11-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Transition and animation do not work with QWebView anymore
            https://bugs.webkit.org/show_bug.cgi?id=49797
    
            Accelerated compositing should not be enabled on QWebView without
            texture mapper.
    
            * WebCoreSupport/PageClientQt.h:
            (WebCore::PageClientQWidget::allowsAcceleratedCompositing):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 9f7dca8..2fd32bf 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-19  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Transition and animation do not work with QWebView anymore
+        https://bugs.webkit.org/show_bug.cgi?id=49797
+
+        Accelerated compositing should not be enabled on QWebView without
+        texture mapper.
+
+        * WebCoreSupport/PageClientQt.h:
+        (WebCore::PageClientQWidget::allowsAcceleratedCompositing):
+
 2010-11-19  Yi Shen  <yi.4.shen at nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/WebKit/qt/WebCoreSupport/PageClientQt.h b/WebKit/qt/WebCoreSupport/PageClientQt.h
index 924d2a7..6745cdc 100644
--- a/WebKit/qt/WebCoreSupport/PageClientQt.h
+++ b/WebKit/qt/WebCoreSupport/PageClientQt.h
@@ -96,8 +96,11 @@ public:
     void syncLayers(Timer<PageClientQWidget>*);
 #endif
 
-    // QGraphicsWebView can render composited layers
+#if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     virtual bool allowsAcceleratedCompositing() const { return true; }
+#else
+    virtual bool allowsAcceleratedCompositing() const { return false; }
+#endif
 
 #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER)
     Timer<PageClientQWidget> syncTimer;

-- 
WebKit Debian packaging