[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 763220fd73c031ad430d2fe7c2a7036487122466
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 20:17:58 2010 +0000

    2010-07-16  Simon Fraser  <simon.fraser at apple.com>
    
            Reviewed by Sam Weinig.
    
            Assertion when turning Accelerated Compositing off on a composited page
            https://bugs.webkit.org/show_bug.cgi?id=42408
    
            When accelerated compositing is turned off, check m_hasAcceleratedCompositing
            before saying that the root layer will be composited. Fixes an assertion.
    
            * rendering/RenderLayerCompositor.cpp:
            (WebCore::RenderLayerCompositor::computeCompositingRequirements):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63573 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9c3a57d..f27a561 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-16  Simon Fraser  <simon.fraser at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Assertion when turning Accelerated Compositing off on a composited page
+        https://bugs.webkit.org/show_bug.cgi?id=42408
+
+        When accelerated compositing is turned off, check m_hasAcceleratedCompositing
+        before saying that the root layer will be composited. Fixes an assertion.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+
 2010-07-16  Antonio Gomes  <tonikitoo at webkit.org>
 
         Reviewed by Simon Fraser.
diff --git a/WebCore/rendering/RenderLayerCompositor.cpp b/WebCore/rendering/RenderLayerCompositor.cpp
index 1fda34c..36aa570 100644
--- a/WebCore/rendering/RenderLayerCompositor.cpp
+++ b/WebCore/rendering/RenderLayerCompositor.cpp
@@ -600,9 +600,11 @@ void RenderLayerCompositor::computeCompositingRequirements(RenderLayer* layer, O
         }
     }
     
-    // If we just entered compositing mode, the root will have become composited.
-    if (layer->isRootLayer() && inCompositingMode())
-        willBeComposited = true;
+    // If we just entered compositing mode, the root will have become composited (as long as accelerated compositing is enabled).
+    if (layer->isRootLayer()) {
+        if (inCompositingMode() && m_hasAcceleratedCompositing)
+            willBeComposited = true;
+    }
     
     ASSERT(willBeComposited == needsToBeComposited(layer));
 

-- 
WebKit Debian packaging