Diff
Modified: trunk/Source/WebCore/ChangeLog (208394 => 208395)
--- trunk/Source/WebCore/ChangeLog 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/ChangeLog 2016-11-04 19:42:26 UTC (rev 208395)
@@ -1,3 +1,63 @@
+2016-11-04 Simon Fraser <[email protected]>
+
+ Rename some ScrollingTree/Node-related functions to reduce the number of uses of "update"
+ https://bugs.webkit.org/show_bug.cgi?id=164420
+
+ Reviewed by Tim Horton.
+
+ Rename:
+ commitNewTreeState -> commitTreeState ("new" was redundant)
+ updateBeforeChildren -> commitStateBeforeChildren
+ updateAfterChildren -> commitStateAfterChildren
+
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::commitTreeState):
+ (WebCore::ScrollingTree::updateTreeFromStateNode):
+ (WebCore::ScrollingTree::commitNewTreeState): Deleted.
+ * page/scrolling/ScrollingTree.h:
+ * page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
+ (WebCore::ScrollingTreeFrameScrollingNode::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeFrameScrollingNode::updateBeforeChildren): Deleted.
+ * page/scrolling/ScrollingTreeFrameScrollingNode.h:
+ * page/scrolling/ScrollingTreeNode.h:
+ (WebCore::ScrollingTreeNode::commitStateAfterChildren):
+ (WebCore::ScrollingTreeNode::updateAfterChildren): Deleted.
+ * page/scrolling/ScrollingTreeScrollingNode.cpp:
+ (WebCore::ScrollingTreeScrollingNode::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeScrollingNode::commitStateAfterChildren):
+ (WebCore::ScrollingTreeScrollingNode::updateBeforeChildren): Deleted.
+ (WebCore::ScrollingTreeScrollingNode::updateAfterChildren): Deleted.
+ * page/scrolling/ScrollingTreeScrollingNode.h:
+ * page/scrolling/ThreadedScrollingTree.cpp:
+ (WebCore::ThreadedScrollingTree::commitTreeState):
+ (WebCore::ThreadedScrollingTree::commitNewTreeState): Deleted.
+ * page/scrolling/ThreadedScrollingTree.h:
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::commitStateAfterChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateBeforeChildren): Deleted.
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateAfterChildren): Deleted.
+ * page/scrolling/ios/ScrollingTreeIOS.cpp:
+ (WebCore::ScrollingTreeIOS::commitNewTreeState): Deleted.
+ * page/scrolling/ios/ScrollingTreeIOS.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::commitTreeState):
+ * page/scrolling/mac/ScrollingTreeFixedNode.h:
+ * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeFixedNode::updateBeforeChildren): Deleted.
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::commitStateAfterChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren): Deleted.
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::updateAfterChildren): Deleted.
+ * page/scrolling/mac/ScrollingTreeStickyNode.h:
+ * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeStickyNode::updateBeforeChildren): Deleted.
+
2016-11-03 Anders Carlsson <[email protected]>
Add new 'other' Apple Pay button style
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2016-11-04 19:42:26 UTC (rev 208395)
@@ -115,7 +115,7 @@
scrollingTreeNodeDidScroll(nodeID, scrollPosition, inUserInteration ? SyncScrollingLayerPosition : SetScrollingLayerPosition);
}
-void ScrollingTree::commitNewTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
+void ScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
{
bool rootStateNodeChanged = scrollingStateTree->hasNewRootStateNode();
@@ -178,7 +178,7 @@
}
}
- node->updateBeforeChildren(*stateNode);
+ node->commitStateBeforeChildren(*stateNode);
// Move all children into the orphanNodes map. Live ones will get added back as we recurse over children.
if (auto nodeChildren = node->children()) {
@@ -195,7 +195,7 @@
updateTreeFromStateNode(child.get(), orphanNodes);
}
- node->updateAfterChildren(*stateNode);
+ node->commitStateAfterChildren(*stateNode);
}
void ScrollingTree::removeDestroyedNodes(const ScrollingStateTree& stateTree)
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -68,7 +68,7 @@
bool isScrollSnapInProgress();
virtual void invalidate() { }
- WEBCORE_EXPORT virtual void commitNewTreeState(std::unique_ptr<ScrollingStateTree>);
+ WEBCORE_EXPORT virtual void commitTreeState(std::unique_ptr<ScrollingStateTree>);
void setMainFramePinState(bool pinnedToTheLeft, bool pinnedToTheRight, bool pinnedToTheTop, bool pinnedToTheBottom);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2016-11-04 19:42:26 UTC (rev 208395)
@@ -42,9 +42,9 @@
{
}
-void ScrollingTreeFrameScrollingNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeFrameScrollingNode::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
{
- ScrollingTreeScrollingNode::updateBeforeChildren(stateNode);
+ ScrollingTreeScrollingNode::commitStateBeforeChildren(stateNode);
const ScrollingStateFrameScrollingNode& state = downcast<ScrollingStateFrameScrollingNode>(stateNode);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -39,7 +39,7 @@
public:
virtual ~ScrollingTreeFrameScrollingNode();
- void updateBeforeChildren(const ScrollingStateNode&) override;
+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
// FIXME: We should implement this when we support ScrollingTreeScrollingNodes as children.
void updateLayersAfterAncestorChange(const ScrollingTreeNode& /*changedNode*/, const FloatRect& /*fixedPositionRect*/, const FloatSize& /*cumulativeDelta*/) override { }
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -52,8 +52,8 @@
bool isFrameScrollingNode() const { return nodeType() == FrameScrollingNode; }
bool isOverflowScrollingNode() const { return nodeType() == OverflowScrollingNode; }
- virtual void updateBeforeChildren(const ScrollingStateNode&) = 0;
- virtual void updateAfterChildren(const ScrollingStateNode&) { }
+ virtual void commitStateBeforeChildren(const ScrollingStateNode&) = 0;
+ virtual void commitStateAfterChildren(const ScrollingStateNode&) { }
virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) = 0;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2016-11-04 19:42:26 UTC (rev 208395)
@@ -42,7 +42,7 @@
{
}
-void ScrollingTreeScrollingNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeScrollingNode::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
{
const ScrollingStateScrollingNode& state = downcast<ScrollingStateScrollingNode>(stateNode);
@@ -85,7 +85,7 @@
m_scrollableAreaParameters = state.scrollableAreaParameters();
}
-void ScrollingTreeScrollingNode::updateAfterChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeScrollingNode::commitStateAfterChildren(const ScrollingStateNode& stateNode)
{
const ScrollingStateScrollingNode& scrollingStateNode = downcast<ScrollingStateScrollingNode>(stateNode);
if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -41,8 +41,8 @@
public:
virtual ~ScrollingTreeScrollingNode();
- WEBCORE_EXPORT void updateBeforeChildren(const ScrollingStateNode&) override;
- WEBCORE_EXPORT void updateAfterChildren(const ScrollingStateNode&) override;
+ WEBCORE_EXPORT void commitStateBeforeChildren(const ScrollingStateNode&) override;
+ WEBCORE_EXPORT void commitStateAfterChildren(const ScrollingStateNode&) override;
WEBCORE_EXPORT void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2016-11-04 19:42:26 UTC (rev 208395)
@@ -86,10 +86,10 @@
});
}
-void ThreadedScrollingTree::commitNewTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
+void ThreadedScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
{
ASSERT(ScrollingThread::isCurrentThread());
- ScrollingTree::commitNewTreeState(WTFMove(scrollingStateTree));
+ ScrollingTree::commitTreeState(WTFMove(scrollingStateTree));
}
void ThreadedScrollingTree::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition scrollingLayerPositionAction)
Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -43,7 +43,7 @@
public:
virtual ~ThreadedScrollingTree();
- void commitNewTreeState(std::unique_ptr<ScrollingStateTree>) override;
+ void commitTreeState(std::unique_ptr<ScrollingStateTree>) override;
void handleWheelEvent(const PlatformWheelEvent&) override;
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -43,8 +43,9 @@
ScrollingTreeFrameScrollingNodeIOS(ScrollingTree&, ScrollingNodeID);
// ScrollingTreeNode member functions.
- void updateBeforeChildren(const ScrollingStateNode&) override;
- void updateAfterChildren(const ScrollingStateNode&) override;
+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
+ void commitStateAfterChildren(const ScrollingStateNode&) override;
+
void handleWheelEvent(const PlatformWheelEvent&) override { }
FloatPoint scrollPosition() const override;
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2016-11-04 19:42:26 UTC (rev 208395)
@@ -54,9 +54,9 @@
{
}
-void ScrollingTreeFrameScrollingNodeIOS::updateBeforeChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeFrameScrollingNodeIOS::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
{
- ScrollingTreeFrameScrollingNode::updateBeforeChildren(stateNode);
+ ScrollingTreeFrameScrollingNode::commitStateBeforeChildren(stateNode);
const auto& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(stateNode);
@@ -86,9 +86,9 @@
}
}
-void ScrollingTreeFrameScrollingNodeIOS::updateAfterChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeFrameScrollingNodeIOS::commitStateAfterChildren(const ScrollingStateNode& stateNode)
{
- ScrollingTreeFrameScrollingNode::updateAfterChildren(stateNode);
+ ScrollingTreeFrameScrollingNode::commitStateAfterChildren(stateNode);
const auto& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(stateNode);
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2016-11-04 19:42:26 UTC (rev 208395)
@@ -70,11 +70,6 @@
});
}
-void ScrollingTreeIOS::commitNewTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
-{
- ScrollingTree::commitNewTreeState(WTFMove(scrollingStateTree));
-}
-
void ScrollingTreeIOS::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition scrollingLayerPositionAction)
{
if (!m_scrollingCoordinator)
Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -41,8 +41,6 @@
static Ref<ScrollingTreeIOS> create(AsyncScrollingCoordinator*);
virtual ~ScrollingTreeIOS();
- void commitNewTreeState(std::unique_ptr<ScrollingStateTree>) override;
-
// No wheel events on iOS
void handleWheelEvent(const PlatformWheelEvent&) override { }
EventResult tryToHandleWheelEvent(const PlatformWheelEvent&) override { return DidNotHandleEvent; }
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2016-11-04 19:42:26 UTC (rev 208395)
@@ -117,7 +117,7 @@
ScrollingThread::dispatch([threadedScrollingTree, unprotectedTreeState] {
std::unique_ptr<ScrollingStateTree> treeState(unprotectedTreeState);
- threadedScrollingTree->commitNewTreeState(WTFMove(treeState));
+ threadedScrollingTree->commitTreeState(WTFMove(treeState));
});
updateTiledScrollingIndicator();
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -46,7 +46,7 @@
private:
ScrollingTreeFixedNode(ScrollingTree&, ScrollingNodeID);
- void updateBeforeChildren(const ScrollingStateNode&) override;
+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
FixedPositionViewportConstraints m_constraints;
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2016-11-04 19:42:26 UTC (rev 208395)
@@ -50,7 +50,7 @@
scrollingTree().fixedOrStickyNodeRemoved();
}
-void ScrollingTreeFixedNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeFixedNode::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
{
const ScrollingStateFixedNode& fixedStateNode = downcast<ScrollingStateFixedNode>(stateNode);
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -47,8 +47,9 @@
void releaseReferencesToScrollerImpsOnTheMainThread();
// ScrollingTreeNode member functions.
- void updateBeforeChildren(const ScrollingStateNode&) override;
- void updateAfterChildren(const ScrollingStateNode&) override;
+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
+ void commitStateAfterChildren(const ScrollingStateNode&) override;
+
void handleWheelEvent(const PlatformWheelEvent&) override;
// ScrollController member functions.
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-11-04 19:42:26 UTC (rev 208395)
@@ -92,9 +92,9 @@
}
#endif
-void ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeFrameScrollingNodeMac::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
{
- ScrollingTreeFrameScrollingNode::updateBeforeChildren(stateNode);
+ ScrollingTreeFrameScrollingNode::commitStateBeforeChildren(stateNode);
const auto& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(stateNode);
if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
@@ -165,9 +165,9 @@
m_hadFirstUpdate = true;
}
-void ScrollingTreeFrameScrollingNodeMac::updateAfterChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeFrameScrollingNodeMac::commitStateAfterChildren(const ScrollingStateNode& stateNode)
{
- ScrollingTreeFrameScrollingNode::updateAfterChildren(stateNode);
+ ScrollingTreeFrameScrollingNode::commitStateAfterChildren(stateNode);
const auto& scrollingStateNode = downcast<ScrollingStateScrollingNode>(stateNode);
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -46,7 +46,7 @@
private:
ScrollingTreeStickyNode(ScrollingTree&, ScrollingNodeID);
- void updateBeforeChildren(const ScrollingStateNode&) override;
+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
StickyPositionViewportConstraints m_constraints;
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (208394 => 208395)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2016-11-04 19:42:26 UTC (rev 208395)
@@ -52,7 +52,7 @@
scrollingTree().fixedOrStickyNodeRemoved();
}
-void ScrollingTreeStickyNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeStickyNode::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
{
const ScrollingStateStickyNode& stickyStateNode = downcast<ScrollingStateStickyNode>(stateNode);
Modified: trunk/Source/WebKit2/ChangeLog (208394 => 208395)
--- trunk/Source/WebKit2/ChangeLog 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-04 19:42:26 UTC (rev 208395)
@@ -1,3 +1,29 @@
+2016-11-04 Simon Fraser <[email protected]>
+
+ Rename some ScrollingTree/Node-related functions to reduce the number of uses of "update"
+ https://bugs.webkit.org/show_bug.cgi?id=164420
+
+ Reviewed by Tim Horton.
+
+ Rename:
+ commitNewTreeState -> commitTreeState ("new" was redundant)
+ updateBeforeChildren -> commitStateBeforeChildren
+ updateAfterChildren -> commitStateAfterChildren
+
+
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+ (WebKit::RemoteScrollingCoordinatorProxy::commitScrollingTreeState):
+ (WebKit::RemoteScrollingCoordinatorProxy::updateScrollingTree): Deleted.
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::commitStateBeforeChildren):
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::commitStateAfterChildren):
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateBeforeChildren): Deleted.
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren): Deleted.
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
+
2016-11-04 Carlos Garcia Campos <[email protected]>
NetworkSession: Add NetworkDataTask implementation for blobs
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (208394 => 208395)
--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2016-11-04 19:42:26 UTC (rev 208395)
@@ -76,7 +76,7 @@
return &remoteDrawingArea.remoteLayerTreeHost();
}
-void RemoteScrollingCoordinatorProxy::updateScrollingTree(const RemoteScrollingCoordinatorTransaction& transaction, RequestedScrollInfo& requestedScrollInfo)
+void RemoteScrollingCoordinatorProxy::commitScrollingTreeState(const RemoteScrollingCoordinatorTransaction& transaction, RequestedScrollInfo& requestedScrollInfo)
{
m_requestedScrollInfo = &requestedScrollInfo;
@@ -90,7 +90,7 @@
}
connectStateNodeLayers(*stateTree, *layerTreeHost);
- m_scrollingTree->commitNewTreeState(WTFMove(stateTree));
+ m_scrollingTree->commitTreeState(WTFMove(stateTree));
m_requestedScrollInfo = nullptr;
}
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h (208394 => 208395)
--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -75,7 +75,7 @@
bool requestIsProgrammaticScroll { };
WebCore::FloatPoint requestedScrollPosition;
};
- void updateScrollingTree(const RemoteScrollingCoordinatorTransaction&, RequestedScrollInfo&);
+ void commitScrollingTreeState(const RemoteScrollingCoordinatorTransaction&, RequestedScrollInfo&);
void setPropagatesMainFrameScrolls(bool propagatesMainFrameScrolls) { m_propagatesMainFrameScrolls = propagatesMainFrameScrolls; }
bool propagatesMainFrameScrolls() const { return m_propagatesMainFrameScrolls; }
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h (208394 => 208395)
--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2016-11-04 19:42:26 UTC (rev 208395)
@@ -52,8 +52,8 @@
private:
ScrollingTreeOverflowScrollingNodeIOS(WebCore::ScrollingTree&, WebCore::ScrollingNodeID);
- void updateBeforeChildren(const WebCore::ScrollingStateNode&) override;
- void updateAfterChildren(const WebCore::ScrollingStateNode&) override;
+ void commitStateBeforeChildren(const WebCore::ScrollingStateNode&) override;
+ void commitStateAfterChildren(const WebCore::ScrollingStateNode&) override;
WebCore::FloatPoint scrollPosition() const override;
Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (208394 => 208395)
--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2016-11-04 19:42:26 UTC (rev 208395)
@@ -154,7 +154,7 @@
END_BLOCK_OBJC_EXCEPTIONS
}
-void ScrollingTreeOverflowScrollingNodeIOS::updateBeforeChildren(const WebCore::ScrollingStateNode& stateNode)
+void ScrollingTreeOverflowScrollingNodeIOS::commitStateBeforeChildren(const WebCore::ScrollingStateNode& stateNode)
{
if (stateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrollLayer)) {
BEGIN_BLOCK_OBJC_EXCEPTIONS
@@ -165,7 +165,7 @@
END_BLOCK_OBJC_EXCEPTIONS
}
- ScrollingTreeOverflowScrollingNode::updateBeforeChildren(stateNode);
+ ScrollingTreeOverflowScrollingNode::commitStateBeforeChildren(stateNode);
const auto& scrollingStateNode = downcast<ScrollingStateOverflowScrollingNode>(stateNode);
if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
@@ -175,9 +175,9 @@
m_scrolledContentsLayer = scrollingStateNode.scrolledContentsLayer();
}
-void ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren(const ScrollingStateNode& stateNode)
+void ScrollingTreeOverflowScrollingNodeIOS::commitStateAfterChildren(const ScrollingStateNode& stateNode)
{
- ScrollingTreeOverflowScrollingNode::updateAfterChildren(stateNode);
+ ScrollingTreeOverflowScrollingNode::commitStateAfterChildren(stateNode);
TemporaryChange<bool> updatingChange(m_updatingFromStateNode, true);
Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (208394 => 208395)
--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-11-04 19:42:26 UTC (rev 208395)
@@ -193,7 +193,7 @@
#if ENABLE(ASYNC_SCROLLING)
RemoteScrollingCoordinatorProxy::RequestedScrollInfo requestedScrollInfo;
- m_webPageProxy.scrollingCoordinatorProxy()->updateScrollingTree(scrollingTreeTransaction, requestedScrollInfo);
+ m_webPageProxy.scrollingCoordinatorProxy()->commitScrollingTreeState(scrollingTreeTransaction, requestedScrollInfo);
#endif
m_webPageProxy.didCommitLayerTree(layerTreeTransaction);
