Title: [206730] trunk/Source/WebCore
- Revision
- 206730
- Author
- [email protected]
- Date
- 2016-10-03 02:51:18 -0700 (Mon, 03 Oct 2016)
Log Message
Unreviewed. Fix the build with coordinated graphics enabled after r206712.
* page/scrolling/ScrollingStateTree.cpp:
(WebCore::ScrollingStateTree::attachNode):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206729 => 206730)
--- trunk/Source/WebCore/ChangeLog 2016-10-03 05:45:15 UTC (rev 206729)
+++ trunk/Source/WebCore/ChangeLog 2016-10-03 09:51:18 UTC (rev 206730)
@@ -1,3 +1,10 @@
+2016-10-03 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix the build with coordinated graphics enabled after r206712.
+
+ * page/scrolling/ScrollingStateTree.cpp:
+ (WebCore::ScrollingStateTree::attachNode):
+
2016-10-02 Chris Dumez <[email protected]>
Add support for KeyboardEvent.getModifierState() operation
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp (206729 => 206730)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2016-10-03 05:45:15 UTC (rev 206729)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2016-10-03 09:51:18 UTC (rev 206730)
@@ -102,10 +102,12 @@
if (ScrollingStateNode* node = stateNodeForID(newNodeID)) {
if (nodeTypeAndParentMatch(*node, nodeType, parentID))
return newNodeID;
-
+
+#if ENABLE(ASYNC_SCROLLING)
// If the type has changed, we need to destroy and recreate the node with a new ID.
if (nodeType != node->nodeType())
newNodeID = m_scrollingCoordinator->uniqueScrollLayerID();
+#endif
// The node is being re-parented. To do that, we'll remove it, and then create a new node.
removeNodeAndAllDescendants(node, SubframeNodeRemoval::Orphan);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
