Unreviewed. Fix the build with coordinated graphics enabled after r206712.
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Oct 2016 09:51:18 +0000 (09:51 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Oct 2016 09:51:18 +0000 (09:51 +0000)
* page/scrolling/ScrollingStateTree.cpp:
(WebCore::ScrollingStateTree::attachNode):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@206730 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/page/scrolling/ScrollingStateTree.cpp

index 7c42f72..aee6199 100644 (file)
@@ -1,3 +1,10 @@
+2016-10-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix the build with coordinated graphics enabled after r206712.
+
+        * page/scrolling/ScrollingStateTree.cpp:
+        (WebCore::ScrollingStateTree::attachNode):
+
 2016-10-02  Chris Dumez  <cdumez@apple.com>
 
         Add support for KeyboardEvent.getModifierState() operation
index 045d915..98b6cad 100644 (file)
@@ -102,10 +102,12 @@ ScrollingNodeID ScrollingStateTree::attachNode(ScrollingNodeType nodeType, Scrol
     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);