Title: [207129] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 207129
- Author
- [email protected]
- Date
- 2016-10-11 06:46:41 -0700 (Tue, 11 Oct 2016)
Log Message
Merge r206730 - Unreviewed. Fix the build with coordinated graphics enabled after r206712.
* page/scrolling/ScrollingStateTree.cpp:
(WebCore::ScrollingStateTree::attachNode):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207128 => 207129)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:46:32 UTC (rev 207128)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:46:41 UTC (rev 207129)
@@ -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-01 Simon Fraser <[email protected]>
Bad cast when CSS position programmatically changed from -webkit-sticky to fixed
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/page/scrolling/ScrollingStateTree.cpp (207128 => 207129)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2016-10-11 13:46:32 UTC (rev 207128)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2016-10-11 13:46:41 UTC (rev 207129)
@@ -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
