Title: [164769] trunk/Source/WebCore
- Revision
- 164769
- Author
- simon.fra...@apple.com
- Date
- 2014-02-26 18:16:43 -0800 (Wed, 26 Feb 2014)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (164768 => 164769)
--- trunk/Source/WebCore/ChangeLog 2014-02-27 02:08:15 UTC (rev 164768)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 02:16:43 UTC (rev 164769)
@@ -1,5 +1,20 @@
2014-02-26 Simon Fraser <simon.fra...@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.fra...@apple.com>
+
Fix the build with some compiler configurations.
* platform/mac/ScrollAnimatorMac.mm:
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (164768 => 164769)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-27 02:08:15 UTC (rev 164768)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-02-27 02:16:43 UTC (rev 164769)
@@ -3371,7 +3371,6 @@
if (!m_scrollCoordinatedLayers.contains(&layer))
return;
- removeFromScrollCoordinatedLayers(layer);
m_scrollCoordinatedLayers.remove(&layer);
m_scrollCoordinatedLayersNeedingUpdate.remove(&layer);
}
@@ -3533,8 +3532,6 @@
void RenderLayerCompositor::detachScrollCoordinatedLayer(RenderLayer& layer)
{
- ASSERT(m_scrollCoordinatedLayers.contains(&layer));
-
if (RenderLayerBacking* backing = layer.backing())
backing->detachFromScrollingCoordinator();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
