Changeset 166739 in webkit

Timestamp:

Apr 3, 2014, 1:46:03 PM (11 years ago)

Author:

Simon Fraser

Message:

Assertion under RenderLayerCompositor::updateScrollCoordinatedLayer on time.com on iOS
​https://bugs.webkit.org/show_bug.cgi?id=131150

Reviewed by Beth Dakin.

When calling updateScrollCoordinatedLayer() under styleChanged, we haven't done
layout yet so our composting layers haven't been hooked together. Don't try
to add a zero nodeID to the map in this case.

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-02  Simon Fraser  <simon.fraser@apple.com>
+
+        Assertion under RenderLayerCompositor::updateScrollCoordinatedLayer on time.com on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=131150
+
+        Reviewed by Beth Dakin.
+
+        When calling updateScrollCoordinatedLayer() under styleChanged, we haven't done
+        layout yet so our composting layers haven't been hooked together. Don't try
+        to add a zero nodeID to the map in this case.
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer):
+
 2014-04-03  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -3506 +3506 @@
 
         nodeID = scrollingCoordinator->attachToStateTree(nodeType, nodeID, parentNodeID);
+        if (!nodeID)
+            return;
+
         backing->setViewportConstrainedNodeID(nodeID);
 
@@ -3529 +3532 @@
 
         nodeID = scrollingCoordinator->attachToStateTree(isRootLayer ? FrameScrollingNode : OverflowScrollingNode, nodeID, parentNodeID);
+        if (!nodeID)
+            return;
+
         backing->setScrollingNodeID(nodeID);
         m_scrollingNodeToLayerMap.add(nodeID, &layer);