[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andersca at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit 5fa7162f79e2a44f310b35e56c360f995ca7cce3
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 21:11:32 2011 +0000

    2011-01-25  Anders Carlsson  <andersca at apple.com>
    
            Reviewed by Sam Weinig.
    
            Don't inform the UI process about compositing changes when using the new drawing area
            https://bugs.webkit.org/show_bug.cgi?id=53120
    
            * WebProcess/WebPage/WebPage.cpp:
            (WebKit::WebPage::changeAcceleratedCompositingMode):
            Return early if we're using the new drawing area.
    
            (WebKit::WebPage::exitAcceleratedCompositingMode):
            Call setRootCompositingLayer(0) so the drawing area knows when we leave accelerated compositing.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76634 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 7f02c91..68a9508 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-25  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Don't inform the UI process about compositing changes when using the new drawing area
+        https://bugs.webkit.org/show_bug.cgi?id=53120
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::changeAcceleratedCompositingMode):
+        Return early if we're using the new drawing area.
+
+        (WebKit::WebPage::exitAcceleratedCompositingMode):
+        Call setRootCompositingLayer(0) so the drawing area knows when we leave accelerated compositing.
+
 2011-01-25  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index 9ab3b26..ec53da6 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -313,6 +313,11 @@ void WebPage::changeAcceleratedCompositingMode(WebCore::GraphicsLayer* layer)
     if (m_isClosed)
         return;
 
+    // With the new drawing area we don't need to inform the UI process when the accelerated
+    // compositing mode changes.
+    if (m_drawingArea->info().type == DrawingAreaInfo::Impl)
+        return;
+
     bool compositing = layer;
     
     // Tell the UI process that accelerated compositing changed. It may respond by changing
@@ -342,6 +347,7 @@ void WebPage::enterAcceleratedCompositingMode(GraphicsLayer* layer)
 void WebPage::exitAcceleratedCompositingMode()
 {
     changeAcceleratedCompositingMode(0);
+    m_drawingArea->setRootCompositingLayer(0);
 }
 #endif
 

-- 
WebKit Debian packaging