<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169410] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169410">169410</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-27 21:44:54 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do some renaming in the scrolling tree
https://bugs.webkit.org/show_bug.cgi?id=133333
Reviewed by Tim Horton.
Source/WebCore:
Rename ScrollingTreeNode::parentScrollPositionDidChange() to updateLayersAfterAncestorChange()
since this goes deep and to indicate that it's about layer updating.
Also rename the "viewportRect" parameter to "fixedPositionRect", since on iOS
this is the custom fixed-position rect that changes on zooming.
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::viewportChangedViaDelegatedScrolling):
* page/scrolling/ScrollingTree.h:
* page/scrolling/ScrollingTreeFrameScrollingNode.h:
* page/scrolling/ScrollingTreeNode.h:
* page/scrolling/ScrollingTreeScrollingNode.h:
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
(WebCore::ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterViewportChange):
(WebCore::ScrollingTreeFrameScrollingNodeIOS::updateChildNodesAfterScroll):
* page/scrolling/mac/ScrollingTreeFixedNode.h:
* page/scrolling/mac/ScrollingTreeFixedNode.mm:
(WebCore::ScrollingTreeFixedNode::updateLayersAfterAncestorChange):
(WebCore::ScrollingTreeFixedNode::parentScrollPositionDidChange): Deleted.
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition):
* page/scrolling/mac/ScrollingTreeStickyNode.h:
* page/scrolling/mac/ScrollingTreeStickyNode.mm:
(WebCore::ScrollingTreeStickyNode::updateLayersAfterAncestorChange):
(WebCore::ScrollingTreeStickyNode::parentScrollPositionDidChange): Deleted.
Source/WebKit2:
Rename ScrollingTreeNode::parentScrollPositionDidChange() to updateLayersAfterAncestorChange()
since this goes deep and to indicate that it's about layer updating.
Also rename the "viewportRect" parameter to "fixedPositionRect", since on iOS
this is the custom fixed-position rect that changes on zooming.
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::viewportChangedViaDelegatedScrolling):
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateLayersAfterViewportChange):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeh">trunk/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodeh">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodeh">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSh">trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/ChangeLog 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -1,5 +1,40 @@
</span><span class="cx"> 2014-05-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Do some renaming in the scrolling tree
+ https://bugs.webkit.org/show_bug.cgi?id=133333
+
+ Reviewed by Tim Horton.
+
+ Rename ScrollingTreeNode::parentScrollPositionDidChange() to updateLayersAfterAncestorChange()
+ since this goes deep and to indicate that it's about layer updating.
+
+ Also rename the "viewportRect" parameter to "fixedPositionRect", since on iOS
+ this is the custom fixed-position rect that changes on zooming.
+
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::viewportChangedViaDelegatedScrolling):
+ * page/scrolling/ScrollingTree.h:
+ * page/scrolling/ScrollingTreeFrameScrollingNode.h:
+ * page/scrolling/ScrollingTreeNode.h:
+ * page/scrolling/ScrollingTreeScrollingNode.h:
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterViewportChange):
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateChildNodesAfterScroll):
+ * page/scrolling/mac/ScrollingTreeFixedNode.h:
+ * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::updateLayersAfterAncestorChange):
+ (WebCore::ScrollingTreeFixedNode::parentScrollPositionDidChange): Deleted.
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition):
+ * page/scrolling/mac/ScrollingTreeStickyNode.h:
+ * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::updateLayersAfterAncestorChange):
+ (WebCore::ScrollingTreeStickyNode::parentScrollPositionDidChange): Deleted.
+
+2014-05-27 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Instantiate a ScrollingTreeMac on Mac
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133332
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> m_rootNode->handleWheelEvent(wheelEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTree::viewportChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const WebCore::FloatRect& viewportRect, double scale)
</del><ins>+void ScrollingTree::viewportChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const WebCore::FloatRect& fixedPositionRect, double scale)
</ins><span class="cx"> {
</span><span class="cx"> ScrollingTreeNode* node = nodeForID(nodeID);
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> if (!node->isScrollingNode())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- toScrollingTreeScrollingNode(node)->updateLayersAfterViewportChange(viewportRect, scale);
</del><ins>+ toScrollingTreeScrollingNode(node)->updateLayersAfterViewportChange(fixedPositionRect, scale);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTree::scrollPositionChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const WebCore::FloatPoint& scrollPosition, bool inUserInteration)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> // Delegated scrolling/zooming has caused the viewport to change, so update viewport-constrained layers
</span><span class="cx"> // (but don't cause scroll events to be fired).
</span><del>- virtual void viewportChangedViaDelegatedScrolling(ScrollingNodeID, const WebCore::FloatRect& viewportRect, double scale);
</del><ins>+ virtual void viewportChangedViaDelegatedScrolling(ScrollingNodeID, const WebCore::FloatRect& fixedPositionRect, double scale);
</ins><span class="cx">
</span><span class="cx"> // Delegated scrolling has scrolled a node. Update layer positions on descendant tree nodes,
</span><span class="cx"> // and call scrollingTreeNodeDidScroll().
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -43,13 +43,13 @@
</span><span class="cx"> virtual void updateBeforeChildren(const ScrollingStateNode&) override;
</span><span class="cx">
</span><span class="cx"> // FIXME: We should implement this when we support ScrollingTreeScrollingNodes as children.
</span><del>- virtual void parentScrollPositionDidChange(const FloatRect& /*viewportRect*/, const FloatSize& /*cumulativeDelta*/) override { }
</del><ins>+ virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& /*changedNode*/, const FloatRect& /*fixedPositionRect*/, const FloatSize& /*cumulativeDelta*/) override { }
</ins><span class="cx">
</span><span class="cx"> virtual void handleWheelEvent(const PlatformWheelEvent&) = 0;
</span><span class="cx"> virtual void setScrollPosition(const FloatPoint&);
</span><span class="cx"> virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) = 0;
</span><span class="cx">
</span><del>- virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale) = 0;
</del><ins>+ virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale) = 0;
</ins><span class="cx"> virtual void updateLayersAfterDelegatedScroll(const FloatPoint&) { }
</span><span class="cx">
</span><span class="cx"> SynchronousScrollingReasons synchronousScrollingReasons() const { return m_synchronousScrollingReasons; }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> virtual void updateBeforeChildren(const ScrollingStateNode&) = 0;
</span><span class="cx"> virtual void updateAfterChildren(const ScrollingStateNode&) { }
</span><span class="cx">
</span><del>- virtual void parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta) = 0;
</del><ins>+ virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) = 0;
</ins><span class="cx">
</span><span class="cx"> ScrollingTreeNode* parent() const { return m_parent; }
</span><span class="cx"> void setParent(ScrollingTreeNode* parent) { m_parent = parent; }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -47,13 +47,13 @@
</span><span class="cx"> virtual void updateAfterChildren(const ScrollingStateNode&) override;
</span><span class="cx">
</span><span class="cx"> // FIXME: We should implement this when we support ScrollingTreeScrollingNodes as children.
</span><del>- virtual void parentScrollPositionDidChange(const FloatRect& /*viewportRect*/, const FloatSize& /*cumulativeDelta*/) override { }
</del><ins>+ virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& /*changedNode*/, const FloatRect& /*fixedPositionRect*/, const FloatSize& /*cumulativeDelta*/) override { }
</ins><span class="cx">
</span><span class="cx"> virtual void handleWheelEvent(const PlatformWheelEvent&) = 0;
</span><span class="cx"> virtual void setScrollPosition(const FloatPoint&);
</span><span class="cx"> virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&);
</span><span class="cx">
</span><del>- virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale) = 0;
</del><ins>+ virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale) = 0;
</ins><span class="cx"> virtual void updateLayersAfterDelegatedScroll(const FloatPoint&) { }
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> virtual FloatPoint scrollPosition() const override;
</span><span class="cx"> virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) override;
</span><span class="cx">
</span><del>- virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale);
</del><ins>+ virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale);
</ins><span class="cx"> virtual void updateLayersAfterDelegatedScroll(const FloatPoint&) override;
</span><span class="cx">
</span><span class="cx"> virtual void setScrollLayerPosition(const FloatPoint&) override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -126,16 +126,17 @@
</span><span class="cx"> updateChildNodesAfterScroll(scrollPosition);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterViewportChange(const FloatRect& viewportRect, double /*scale*/)
</del><ins>+void ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double /*scale*/)
</ins><span class="cx"> {
</span><del>- [m_counterScrollingLayer setPosition:viewportRect.location()];
</del><ins>+ // Note: we never currently have a m_counterScrollingLayer (which is used for background-attachment:fixed) on iOS.
+ [m_counterScrollingLayer setPosition:fixedPositionRect.location()];
</ins><span class="cx">
</span><span class="cx"> if (!m_children)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> size_t size = m_children->size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><del>- m_children->at(i)->parentScrollPositionDidChange(viewportRect, FloatSize());
</del><ins>+ m_children->at(i)->updateLayersAfterAncestorChange(*this, fixedPositionRect, FloatSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeFrameScrollingNodeIOS::updateLayersAfterDelegatedScroll(const FloatPoint& scrollPosition)
</span><span class="lines">@@ -169,14 +170,14 @@
</span><span class="cx">
</span><span class="cx"> if (!m_children)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> viewportRect.setLocation(scrollOffset);
</span><del>-
</del><ins>+
</ins><span class="cx"> FloatRect viewportConstrainedObjectsRect = FrameView::rectForViewportConstrainedObjects(enclosingLayoutRect(viewportRect), roundedLayoutSize(totalContentsSize()), frameScaleFactor(), false, behaviorForFixed);
</span><del>-
</del><ins>+
</ins><span class="cx"> size_t size = m_children->size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><del>- m_children->at(i)->parentScrollPositionDidChange(viewportConstrainedObjectsRect, FloatSize());
</del><ins>+ m_children->at(i)->updateLayersAfterAncestorChange(*this, fixedPositionRect, FloatSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatPoint ScrollingTreeFrameScrollingNodeIOS::minimumScrollPosition() const
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> ScrollingTreeFixedNode(ScrollingTree&, ScrollingNodeID);
</span><span class="cx">
</span><span class="cx"> virtual void updateBeforeChildren(const ScrollingStateNode&) override;
</span><del>- virtual void parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta) override;
</del><ins>+ virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
</ins><span class="cx">
</span><span class="cx"> FixedPositionViewportConstraints m_constraints;
</span><span class="cx"> RetainPtr<CALayer> m_layer;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> return CGPointMake(a.x * b.width, a.y * b.height);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeFixedNode::parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta)
</del><ins>+void ScrollingTreeFixedNode::updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta)
</ins><span class="cx"> {
</span><del>- FloatPoint layerPosition = m_constraints.layerPositionForViewportRect(viewportRect);
</del><ins>+ FloatPoint layerPosition = m_constraints.layerPositionForViewportRect(fixedPositionRect);
</ins><span class="cx"> layerPosition -= cumulativeDelta;
</span><span class="cx">
</span><span class="cx"> CGRect layerBounds = [m_layer.get() bounds];
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> size_t size = m_children->size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><del>- m_children->at(i)->parentScrollPositionDidChange(viewportRect, newDelta);
</del><ins>+ m_children->at(i)->updateLayersAfterAncestorChange(changedNode, fixedPositionRect, newDelta);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> virtual void setScrollPosition(const FloatPoint&) override;
</span><span class="cx"> virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) override;
</span><span class="cx">
</span><del>- virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale) override;
</del><ins>+ virtual void updateLayersAfterViewportChange(const FloatRect& fixedPositionRect, double scale) override;
</ins><span class="cx">
</span><span class="cx"> virtual void setScrollLayerPosition(const FloatPoint&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -349,7 +349,6 @@
</span><span class="cx"> FloatPoint scrollOffset = position - toFloatSize(scrollOrigin());
</span><span class="cx"> FloatRect viewportRect(FloatPoint(), scrollableAreaSize());
</span><span class="cx">
</span><del>- // FIXME: scrollOffsetForFixedPosition() needs to do float math.
</del><span class="cx"> FloatSize scrollOffsetForFixedChildren = FrameView::scrollOffsetForFixedPosition(enclosingLayoutRect(viewportRect),
</span><span class="cx"> roundedLayoutSize(totalContentsSize()), roundedLayoutPoint(scrollOffset), scrollOrigin(), frameScaleFactor(), false, behaviorForFixed, headerHeight(), footerHeight());
</span><span class="cx">
</span><span class="lines">@@ -410,7 +409,7 @@
</span><span class="cx">
</span><span class="cx"> size_t size = m_children->size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><del>- m_children->at(i)->parentScrollPositionDidChange(viewportRect, FloatSize());
</del><ins>+ m_children->at(i)->updateLayersAfterAncestorChange(*this, viewportRect, FloatSize());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeFrameScrollingNodeMac::updateLayersAfterViewportChange(const FloatRect&, double)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> ScrollingTreeStickyNode(ScrollingTree&, ScrollingNodeID);
</span><span class="cx">
</span><span class="cx"> virtual void updateBeforeChildren(const ScrollingStateNode&) override;
</span><del>- virtual void parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta) override;
</del><ins>+ virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
</ins><span class="cx">
</span><span class="cx"> StickyPositionViewportConstraints m_constraints;
</span><span class="cx"> RetainPtr<CALayer> m_layer;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> return CGPointMake(a.x * b.width, a.y * b.height);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeStickyNode::parentScrollPositionDidChange(const FloatRect& viewportRect, const FloatSize& cumulativeDelta)
</del><ins>+void ScrollingTreeStickyNode::updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta)
</ins><span class="cx"> {
</span><del>- FloatPoint layerPosition = m_constraints.layerPositionForConstrainingRect(viewportRect);
</del><ins>+ FloatPoint layerPosition = m_constraints.layerPositionForConstrainingRect(fixedPositionRect);
</ins><span class="cx">
</span><span class="cx"> // FIXME: Subtracting the cumulativeDelta is not totally sufficient to get the new position right for nested
</span><span class="cx"> // sticky objects. We probably need a way to modify the containingBlockRect in the ViewportContraints
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> size_t size = m_children->size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><del>- m_children->at(i)->parentScrollPositionDidChange(viewportRect, newDelta);
</del><ins>+ m_children->at(i)->updateLayersAfterAncestorChange(changedNode, fixedPositionRect, newDelta);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-27 Simon Fraser <simon.fraser@apple.com>
+
+ Do some renaming in the scrolling tree
+ https://bugs.webkit.org/show_bug.cgi?id=133333
+
+ Reviewed by Tim Horton.
+
+ Rename ScrollingTreeNode::parentScrollPositionDidChange() to updateLayersAfterAncestorChange()
+ since this goes deep and to indicate that it's about layer updating.
+
+ Also rename the "viewportRect" parameter to "fixedPositionRect", since on iOS
+ this is the custom fixed-position rect that changes on zooming.
+
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+ (WebKit::RemoteScrollingCoordinatorProxy::viewportChangedViaDelegatedScrolling):
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateLayersAfterViewportChange):
+
</ins><span class="cx"> 2014-05-27 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Some proof-reading of the WebKit2 API headerdoc
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -154,9 +154,9 @@
</span><span class="cx"> return m_scrollingTree->isPointInNonFastScrollableRegion(p);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteScrollingCoordinatorProxy::viewportChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const FloatRect& viewportRect, double scale)
</del><ins>+void RemoteScrollingCoordinatorProxy::viewportChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const FloatRect& fixedPositionRect, double scale)
</ins><span class="cx"> {
</span><del>- m_scrollingTree->viewportChangedViaDelegatedScrolling(nodeID, viewportRect, scale);
</del><ins>+ m_scrollingTree->viewportChangedViaDelegatedScrolling(nodeID, fixedPositionRect, scale);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This comes from the scrolling tree.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> bool isPointInNonFastScrollableRegion(const WebCore::IntPoint&) const;
</span><span class="cx">
</span><span class="cx"> // Called externally when native views move around.
</span><del>- void viewportChangedViaDelegatedScrolling(WebCore::ScrollingNodeID, const WebCore::FloatRect& viewportRect, double scale);
</del><ins>+ void viewportChangedViaDelegatedScrolling(WebCore::ScrollingNodeID, const WebCore::FloatRect& fixedPositionRect, double scale);
</ins><span class="cx">
</span><span class="cx"> // FIXME: expose the tree and pass this to that?
</span><span class="cx"> bool handleWheelEvent(const WebCore::PlatformWheelEvent&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h (169409 => 169410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2014-05-28 04:44:51 UTC (rev 169409)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2014-05-28 04:44:54 UTC (rev 169410)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setScrollLayerPosition(const WebCore::FloatPoint&) override;
</span><span class="cx">
</span><del>- virtual void updateLayersAfterViewportChange(const WebCore::FloatRect& viewportRect, double scale) { }
</del><ins>+ virtual void updateLayersAfterViewportChange(const WebCore::FloatRect& fixedPositionRect, double scale) { }
</ins><span class="cx"> virtual void handleWheelEvent(const WebCore::PlatformWheelEvent&) override { }
</span><span class="cx">
</span><span class="cx"> void updateChildNodesAfterScroll(const WebCore::FloatPoint&);
</span></span></pre>
</div>
</div>
</body>
</html>