<!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>[166517] trunk/Source/WebCore</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/166517">166517</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 12:42:02 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clarify some scrolling tree terminology
https://bugs.webkit.org/show_bug.cgi?id=130929
Reviewed by Tim Horton.
Attempt to reduce some ambiguity in scrolling tree terminology.
When async scrolling occurs, there are two tasks we have to perform:
1. Layers need to be updated to reflect the scroll
2. WebCore state has to be updated.
The "updateForViewport" name didn't clearly reflect which of these
tasks was being performed, so rename it to updateLayersAfterViewportChange()
to reflect the fact that it only does the first.
Remove the Mac implementation of updateLayersAfterViewportChange(), since
it was confsued about this, and was never called anyway.
* WebCore.exp.in:
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::viewportChangedViaDelegatedScrolling):
* page/scrolling/ScrollingTreeScrollingNode.h:
* page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h:
* page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm:
(WebCore::ScrollingTreeScrollingNodeIOS::updateLayersAfterViewportChange):
(WebCore::ScrollingTreeScrollingNodeIOS::updateForViewport): Deleted.
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
(WebCore::ScrollingTreeScrollingNodeMac::updateLayersAfterViewportChange):
(WebCore::ScrollingTreeScrollingNodeMac::updateForViewport): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeScrollingNodeIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeScrollingNodeIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166516 => 166517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-31 19:37:30 UTC (rev 166516)
+++ trunk/Source/WebCore/ChangeLog 2014-03-31 19:42:02 UTC (rev 166517)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-03-29 Simon Fraser <simon.fraser@apple.com>
+
+ Clarify some scrolling tree terminology
+ https://bugs.webkit.org/show_bug.cgi?id=130929
+
+ Reviewed by Tim Horton.
+
+ Attempt to reduce some ambiguity in scrolling tree terminology.
+ When async scrolling occurs, there are two tasks we have to perform:
+ 1. Layers need to be updated to reflect the scroll
+ 2. WebCore state has to be updated.
+ The "updateForViewport" name didn't clearly reflect which of these
+ tasks was being performed, so rename it to updateLayersAfterViewportChange()
+ to reflect the fact that it only does the first.
+
+ Remove the Mac implementation of updateLayersAfterViewportChange(), since
+ it was confsued about this, and was never called anyway.
+
+ * WebCore.exp.in:
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::viewportChangedViaDelegatedScrolling):
+ * page/scrolling/ScrollingTreeScrollingNode.h:
+ * page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h:
+ * page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeScrollingNodeIOS::updateLayersAfterViewportChange):
+ (WebCore::ScrollingTreeScrollingNodeIOS::updateForViewport): Deleted.
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeScrollingNodeMac::updateLayersAfterViewportChange):
+ (WebCore::ScrollingTreeScrollingNodeMac::updateForViewport): Deleted.
+
</ins><span class="cx"> 2014-03-31 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] Disable tile cohort retention for now
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (166516 => 166517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-31 19:37:30 UTC (rev 166516)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-31 19:42:02 UTC (rev 166517)
</span><span class="lines">@@ -2798,9 +2798,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING) && PLATFORM(IOS)
</span><span class="cx"> __ZN7WebCore29ScrollingTreeScrollingNodeIOS17setScrollPositionERKNS_10FloatPointE
</span><del>-__ZN7WebCore29ScrollingTreeScrollingNodeIOS17updateForViewportERKNS_9FloatRectEd
</del><span class="cx"> __ZN7WebCore29ScrollingTreeScrollingNodeIOS19updateAfterChildrenERKNS_18ScrollingStateNodeE
</span><span class="cx"> __ZN7WebCore29ScrollingTreeScrollingNodeIOS20updateBeforeChildrenERKNS_18ScrollingStateNodeE
</span><ins>+__ZN7WebCore29ScrollingTreeScrollingNodeIOS31updateLayersAfterViewportChangeERKNS_9FloatRectEd
</ins><span class="cx"> __ZN7WebCore29ScrollingTreeScrollingNodeIOS46setScrollPositionWithoutContentEdgeConstraintsERKNS_10FloatPointE
</span><span class="cx"> __ZN7WebCore29ScrollingTreeScrollingNodeIOS6createERNS_13ScrollingTreeENS_17ScrollingNodeTypeEy
</span><span class="cx"> __ZN7WebCore29ScrollingTreeScrollingNodeIOSC2ERNS_13ScrollingTreeENS_17ScrollingNodeTypeEy
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (166516 => 166517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-03-31 19:37:30 UTC (rev 166516)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-03-31 19:42:02 UTC (rev 166517)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> if (node->nodeType() != FrameScrollingNode && node->nodeType() != OverflowScrollingNode)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- toScrollingTreeScrollingNode(node)->updateForViewport(viewportRect, scale);
</del><ins>+ toScrollingTreeScrollingNode(node)->updateLayersAfterViewportChange(viewportRect, scale);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTree::commitNewTreeState(PassOwnPtr<ScrollingStateTree> scrollingStateTree)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (166516 => 166517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2014-03-31 19:37:30 UTC (rev 166516)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2014-03-31 19:42:02 UTC (rev 166517)
</span><span class="lines">@@ -52,7 +52,8 @@
</span><span class="cx"> virtual void handleWheelEvent(const PlatformWheelEvent&) = 0;
</span><span class="cx"> virtual void setScrollPosition(const FloatPoint&) = 0;
</span><span class="cx"> virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) = 0;
</span><del>- virtual void updateForViewport(const FloatRect& viewportRect, double scale) = 0;
</del><ins>+
+ virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale) = 0;
</ins><span class="cx">
</span><span class="cx"> SynchronousScrollingReasons synchronousScrollingReasons() const { return m_synchronousScrollingReasons; }
</span><span class="cx"> bool shouldUpdateScrollLayerPositionSynchronously() const { return m_synchronousScrollingReasons; }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeScrollingNodeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h (166516 => 166517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h 2014-03-31 19:37:30 UTC (rev 166516)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.h 2014-03-31 19:42:02 UTC (rev 166517)
</span><span class="lines">@@ -54,8 +54,9 @@
</span><span class="cx"> FloatPoint scrollPosition() const;
</span><span class="cx"> virtual void setScrollPosition(const FloatPoint&) override;
</span><span class="cx"> virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) override;
</span><del>- virtual void updateForViewport(const FloatRect& viewportRect, double scale);
</del><span class="cx">
</span><ins>+ virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale);
+
</ins><span class="cx"> void setScrollLayerPosition(const FloatPoint&);
</span><span class="cx">
</span><span class="cx"> FloatPoint minimumScrollPosition() const;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm (166516 => 166517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm 2014-03-31 19:37:30 UTC (rev 166516)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm 2014-03-31 19:42:02 UTC (rev 166517)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> m_children->at(i)->parentScrollPositionDidChange(viewportConstrainedObjectsRect, FloatSize());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeScrollingNodeIOS::updateForViewport(const FloatRect& viewportRect, double scale)
</del><ins>+void ScrollingTreeScrollingNodeIOS::updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale)
</ins><span class="cx"> {
</span><span class="cx"> [m_counterScrollingLayer setPosition:viewportRect.location()];
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h (166516 => 166517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2014-03-31 19:37:30 UTC (rev 166516)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2014-03-31 19:42:02 UTC (rev 166517)
</span><span class="lines">@@ -68,8 +68,9 @@
</span><span class="cx"> FloatPoint scrollPosition() const;
</span><span class="cx"> virtual void setScrollPosition(const FloatPoint&) override;
</span><span class="cx"> virtual void setScrollPositionWithoutContentEdgeConstraints(const FloatPoint&) override;
</span><del>- virtual void updateForViewport(const FloatRect& viewportRect, double scale) override;
</del><span class="cx">
</span><ins>+ virtual void updateLayersAfterViewportChange(const FloatRect& viewportRect, double scale) override;
+
</ins><span class="cx"> void setScrollLayerPosition(const FloatPoint&);
</span><span class="cx">
</span><span class="cx"> FloatPoint minimumScrollPosition() const;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (166516 => 166517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-03-31 19:37:30 UTC (rev 166516)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-03-31 19:42:02 UTC (rev 166517)
</span><span class="lines">@@ -400,21 +400,9 @@
</span><span class="cx"> m_children->at(i)->parentScrollPositionDidChange(viewportRect, FloatSize());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeScrollingNodeMac::updateForViewport(const FloatRect& viewportRect, double scale)
</del><ins>+void ScrollingTreeScrollingNodeMac::updateLayersAfterViewportChange(const FloatRect&, double)
</ins><span class="cx"> {
</span><del>- // FIXME: correctly handle updates for zooming.
- UNUSED_PARAM(scale);
- FloatPoint scrollPosition = viewportRect.location();
- updateMainFramePinState(scrollPosition);
-
- if (shouldUpdateScrollLayerPositionSynchronously()) {
- m_probableMainThreadScrollPosition = scrollPosition;
- scrollingTree().scrollingTreeNodeDidScroll(scrollingNodeID(), scrollPosition, SetScrollingLayerPosition);
- return;
- }
-
- setScrollLayerPosition(scrollPosition);
- scrollingTree().scrollingTreeNodeDidScroll(scrollingNodeID(), scrollPosition);
</del><ins>+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatPoint ScrollingTreeScrollingNodeMac::minimumScrollPosition() const
</span></span></pre>
</div>
</div>
</body>
</html>