Changeset 164769 in webkit

Timestamp:

Feb 26, 2014 6:16:43 PM (10 years ago)

Author:

Simon Fraser

Message:

Fix two assertions/crashes in compositing code
​https://bugs.webkit.org/show_bug.cgi?id=129414

Reviewed by Dean Jackson.

Fix two issues introduced in r164759.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::removeFromScrollCoordinatedLayers): Don't call
ourselves recursively!
(WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): We call this
function unconditionally on layer teardown, so this assertion is bogus.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-26  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix two assertions/crashes in compositing code
+        https://bugs.webkit.org/show_bug.cgi?id=129414
+
+        Reviewed by Dean Jackson.
+
+        Fix two issues introduced in r164759.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::removeFromScrollCoordinatedLayers): Don't call
+        ourselves recursively!
+        (WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): We call this
+        function unconditionally on layer teardown, so this assertion is bogus.
+
 2014-02-26  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -3372 +3372 @@
         return;
 
-    removeFromScrollCoordinatedLayers(layer);
     m_scrollCoordinatedLayers.remove(&layer);
     m_scrollCoordinatedLayersNeedingUpdate.remove(&layer);
@@ -3534 +3533 @@
 void RenderLayerCompositor::detachScrollCoordinatedLayer(RenderLayer& layer)
 {
-    ASSERT(m_scrollCoordinatedLayers.contains(&layer));
-
     if (RenderLayerBacking* backing = layer.backing())
         backing->detachFromScrollingCoordinator();