<!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>[165493] trunk</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/165493">165493</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-12 11:55:53 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have the scrolling tree track the viewport size, not the viewport rect
https://bugs.webkit.org/show_bug.cgi?id=130141
Reviewed by Beth Dakin.
Source/WebCore:
The scrolling tree only needs to know the size of the viewport, not its
origin, since the origin is deduced from the updated scroll position.
* WebCore.exp.in:
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
* page/scrolling/ScrollingStateScrollingNode.cpp:
(WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
(WebCore::ScrollingStateScrollingNode::setViewportSize):
(WebCore::ScrollingStateScrollingNode::dumpProperties):
* page/scrolling/ScrollingStateScrollingNode.h:
* page/scrolling/ScrollingTreeScrollingNode.cpp:
(WebCore::ScrollingTreeScrollingNode::updateBeforeChildren):
* page/scrolling/ScrollingTreeScrollingNode.h:
(WebCore::ScrollingTreeScrollingNode::viewportSize):
* page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm:
(WebCore::ScrollingTreeScrollingNodeIOS::setScrollLayerPosition):
(WebCore::ScrollingTreeScrollingNodeIOS::maximumScrollPosition):
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
(WebCore::ScrollingTreeScrollingNodeMac::updateAfterChildren):
(WebCore::ScrollingTreeScrollingNodeMac::setScrollLayerPosition):
(WebCore::ScrollingTreeScrollingNodeMac::maximumScrollPosition):
(WebCore::ScrollingTreeScrollingNodeMac::logExposedUnfilledArea):
Source/WebKit2:
The scrolling tree only needs to know the size of the viewport, not its
origin, since the origin is deduced from the updated scroll position.
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(ArgumentCoder<ScrollingStateScrollingNode>::encode):
(ArgumentCoder<ScrollingStateScrollingNode>::decode):
LayoutTests:
The scrolling tree only needs to know the size of the viewport, not its
origin, since the origin is deduced from the updated scroll position.
Tests dump a size, not a rect with a 0,0 origin now.
* platform/mac-wk2/tiled-drawing/clamp-out-of-bounds-scrolls-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/absolute-inside-fixed-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/absolute-inside-out-of-view-fixed-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/fixed-in-overflow-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/four-bars-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/four-bars-with-header-and-footer-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-in-view-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/nested-fixed-expected.txt:
* platform/mac-wk2/tiled-drawing/fixed/percentage-inside-fixed-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling-tree-after-scroll-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt:
* platform/mac-wk2/tiled-drawing/sticky/negative-scroll-offset-expected.txt:
* platform/mac-wk2/tiled-drawing/sticky/sticky-horizontal-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingclampoutofboundsscrollsexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/clamp-out-of-bounds-scrolls-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixedabsoluteinsidefixedexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/absolute-inside-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixedabsoluteinsideoutofviewfixedexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/absolute-inside-out-of-view-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixedfixedinoverflowexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-in-overflow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixedfixedpositionoutofviewexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixedfixedpositionoutofviewnegativezindexexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixedfourbarsexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixedfourbarswithheaderandfooterexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-with-header-and-footer-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixednegativescrolloffsetexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixednegativescrolloffsetinviewexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-in-view-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixednestedfixedexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/nested-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingfixedpercentageinsidefixedexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/percentage-inside-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingtreeafterscrollexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling-tree-after-scroll-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingtreeslowscrollingexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingstickynegativescrolloffsetexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/sticky/negative-scroll-offset-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingstickystickyhorizontalexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/sticky/sticky-horizontal-expected.txt</a></li>
<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="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeScrollingNodeIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp">trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/ChangeLog 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-03-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Have the scrolling tree track the viewport size, not the viewport rect
+ https://bugs.webkit.org/show_bug.cgi?id=130141
+
+ Reviewed by Beth Dakin.
+
+ The scrolling tree only needs to know the size of the viewport, not its
+ origin, since the origin is deduced from the updated scroll position.
+
+ Tests dump a size, not a rect with a 0,0 origin now.
+
+ * platform/mac-wk2/tiled-drawing/clamp-out-of-bounds-scrolls-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/absolute-inside-fixed-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/absolute-inside-out-of-view-fixed-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/fixed-in-overflow-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/four-bars-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/four-bars-with-header-and-footer-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-in-view-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/nested-fixed-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fixed/percentage-inside-fixed-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling-tree-after-scroll-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt:
+ * platform/mac-wk2/tiled-drawing/sticky/negative-scroll-offset-expected.txt:
+ * platform/mac-wk2/tiled-drawing/sticky/sticky-horizontal-expected.txt:
+
+2014-03-12 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Change scrollOffsetForFixedPosition() to do LayoutUnit math
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=129981
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingclampoutofboundsscrollsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/clamp-out-of-bounds-scrolls-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/clamp-out-of-bounds-scrolls-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/clamp-out-of-bounds-scrolls-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,38 +1,38 @@
</span><span class="cx"> Attempted scroll to -5000, 0
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 585)
</del><ins>+ (viewport rect 785 585)
</ins><span class="cx"> (contents size 5008 5021)
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> Attempted scroll to 0, -5000
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 585)
</del><ins>+ (viewport rect 785 585)
</ins><span class="cx"> (contents size 5008 5021)
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> Attempted scroll to -5000, -5000
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 585)
</del><ins>+ (viewport rect 785 585)
</ins><span class="cx"> (contents size 5008 5021)
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> Attempted scroll to 10000, 0
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 585)
</del><ins>+ (viewport rect 785 585)
</ins><span class="cx"> (contents size 5008 5021)
</span><span class="cx"> (requested scroll position 4223 0)
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> Attempted scroll to 0, 10000
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 585)
</del><ins>+ (viewport rect 785 585)
</ins><span class="cx"> (contents size 5008 5021)
</span><span class="cx"> (requested scroll position 0 4436)
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> Attempted scroll to 10000, 10000
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 585)
</del><ins>+ (viewport rect 785 585)
</ins><span class="cx"> (contents size 5008 5021)
</span><span class="cx"> (requested scroll position 4223 4436)
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixedabsoluteinsidefixedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/absolute-inside-fixed-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/absolute-inside-fixed-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/absolute-inside-fixed-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2710)
</span><span class="cx"> (requested scroll position 0 200)
</span><span class="cx"> (children 1
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixedabsoluteinsideoutofviewfixedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/absolute-inside-out-of-view-fixed-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/absolute-inside-out-of-view-fixed-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/absolute-inside-out-of-view-fixed-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2513)
</span><span class="cx"> (requested scroll position 0 200)
</span><span class="cx"> (children 1
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixedfixedinoverflowexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-in-overflow-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-in-overflow-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-in-overflow-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2213)
</span><span class="cx"> (requested scroll position 0 200)
</span><span class="cx"> (children 1
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixedfixedpositionoutofviewexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 1021)
</span><span class="cx"> (children 1
</span><span class="cx"> (Fixed node
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixedfixedpositionoutofviewnegativezindexexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/fixed-position-out-of-view-negative-zindex-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 1021)
</span><span class="cx"> (children 1
</span><span class="cx"> (Fixed node
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixedfourbarsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2221)
</span><span class="cx"> (requested scroll position 0 200)
</span><span class="cx"> (children 4
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixedfourbarswithheaderandfooterexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-with-header-and-footer-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-with-header-and-footer-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/four-bars-with-header-and-footer-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2421)
</span><span class="cx"> (requested scroll position 0 200)
</span><span class="cx"> (children 4
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixednegativescrolloffsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2221)
</span><span class="cx"> (children 1
</span><span class="cx"> (Fixed node
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixednegativescrolloffsetinviewexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-in-view-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-in-view-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/negative-scroll-offset-in-view-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2221)
</span><span class="cx"> (children 1
</span><span class="cx"> (Fixed node
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixednestedfixedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/nested-fixed-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/nested-fixed-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/nested-fixed-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2213)
</span><span class="cx"> (requested scroll position 0 200)
</span><span class="cx"> (children 1
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingfixedpercentageinsidefixedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/percentage-inside-fixed-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/percentage-inside-fixed-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fixed/percentage-inside-fixed-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2513)
</span><span class="cx"> (requested scroll position 0 200)
</span><span class="cx"> (children 1
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingtreeafterscrollexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling-tree-after-scroll-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling-tree-after-scroll-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling-tree-after-scroll-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 5021)
</span><span class="cx"> (requested scroll position 0 3000)
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingtreeslowscrollingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling-tree-slow-scrolling-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 800 600)
</del><ins>+ (viewport rect 800 600)
</ins><span class="cx"> (contents size 800 600)
</span><span class="cx"> (Scrolling on main thread because: Has slow repaint objects)
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingstickynegativescrolloffsetexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/sticky/negative-scroll-offset-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/sticky/negative-scroll-offset-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/sticky/negative-scroll-offset-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 785 600)
</del><ins>+ (viewport rect 785 600)
</ins><span class="cx"> (contents size 785 2216)
</span><span class="cx"> (children 1
</span><span class="cx"> (Sticky node
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingstickystickyhorizontalexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/sticky/sticky-horizontal-expected.txt (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/sticky/sticky-horizontal-expected.txt 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/sticky/sticky-horizontal-expected.txt 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> Left sticky Right sticky Left % sticky Right % sticky Left and Right Left and Right %
</span><span class="cx"> (Scrolling node
</span><del>- (viewport rect 0 0 800 585)
</del><ins>+ (viewport rect 800 585)
</ins><span class="cx"> (contents size 2008 585)
</span><span class="cx"> (requested scroll position 800 0)
</span><span class="cx"> (children 6
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebCore/ChangeLog 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2014-03-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Have the scrolling tree track the viewport size, not the viewport rect
+ https://bugs.webkit.org/show_bug.cgi?id=130141
+
+ Reviewed by Beth Dakin.
+
+ The scrolling tree only needs to know the size of the viewport, not its
+ origin, since the origin is deduced from the updated scroll position.
+
+ * WebCore.exp.in:
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated):
+ * page/scrolling/ScrollingStateScrollingNode.cpp:
+ (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
+ (WebCore::ScrollingStateScrollingNode::setViewportSize):
+ (WebCore::ScrollingStateScrollingNode::dumpProperties):
+ * page/scrolling/ScrollingStateScrollingNode.h:
+ * page/scrolling/ScrollingTreeScrollingNode.cpp:
+ (WebCore::ScrollingTreeScrollingNode::updateBeforeChildren):
+ * page/scrolling/ScrollingTreeScrollingNode.h:
+ (WebCore::ScrollingTreeScrollingNode::viewportSize):
+ * page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeScrollingNodeIOS::setScrollLayerPosition):
+ (WebCore::ScrollingTreeScrollingNodeIOS::maximumScrollPosition):
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeScrollingNodeMac::updateAfterChildren):
+ (WebCore::ScrollingTreeScrollingNodeMac::setScrollLayerPosition):
+ (WebCore::ScrollingTreeScrollingNodeMac::maximumScrollPosition):
+ (WebCore::ScrollingTreeScrollingNodeMac::logExposedUnfilledArea):
+
+2014-03-12 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Spelling is hard
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130146
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -2755,6 +2755,7 @@
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode15setFooterHeightEi
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode15setHeaderHeightEi
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode15setScrollOriginERKNS_8IntPointE
</span><ins>+__ZN7WebCore27ScrollingStateScrollingNode15setViewportSizeERKNS_9FloatSizeE
</ins><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode17setScrollPositionERKNS_10FloatPointE
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode19setFrameScaleFactorEf
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode20setTotalContentsSizeERKNS_7IntSizeE
</span><span class="lines">@@ -2765,7 +2766,6 @@
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode26setRequestedScrollPositionERKNS_10FloatPointEb
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode27setScrollableAreaParametersERKNS_24ScrollableAreaParametersE
</span><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode30setSynchronousScrollingReasonsEj
</span><del>-__ZN7WebCore27ScrollingStateScrollingNode32setViewportConstrainedObjectRectERKNS_9FloatRectE
</del><span class="cx"> __ZN7WebCore27ScrollingStateScrollingNode33setScrollBehaviorForFixedElementsENS_30ScrollBehaviorForFixedElementsE
</span><span class="cx"> __ZNK7WebCore25AsyncScrollingCoordinator24scrollingStateTreeAsTextEv
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -90,9 +90,9 @@
</span><span class="cx">
</span><span class="cx"> node->setScrollOrigin(frameView->scrollOrigin());
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- node->setViewportConstrainedObjectRect(FloatRect(FloatPoint(), frameView->viewportConstrainedVisibleContentRect().size()));
</del><ins>+ node->setViewportSize(frameView->viewportConstrainedVisibleContentRect().size());
</ins><span class="cx"> #else
</span><del>- node->setViewportConstrainedObjectRect(FloatRect(FloatPoint(), frameView->visibleContentRect().size()));
</del><ins>+ node->setViewportSize(frameView->visibleContentRect().size());
</ins><span class="cx"> #endif
</span><span class="cx"> node->setTotalContentsSize(frameView->totalContentsSize());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> , m_verticalScrollbarPainter(stateNode.verticalScrollbarPainter())
</span><span class="cx"> , m_horizontalScrollbarPainter(stateNode.horizontalScrollbarPainter())
</span><span class="cx"> #endif
</span><del>- , m_viewportConstrainedObjectRect(stateNode.viewportConstrainedObjectRect())
</del><ins>+ , m_viewportSize(stateNode.viewportSize())
</ins><span class="cx"> , m_totalContentsSize(stateNode.totalContentsSize())
</span><span class="cx"> , m_scrollPosition(stateNode.scrollPosition())
</span><span class="cx"> , m_scrollOrigin(stateNode.scrollOrigin())
</span><span class="lines">@@ -98,13 +98,13 @@
</span><span class="cx"> return adoptPtr(new ScrollingStateScrollingNode(*this, adoptiveTree));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingStateScrollingNode::setViewportConstrainedObjectRect(const FloatRect& viewportConstrainedObjectRect)
</del><ins>+void ScrollingStateScrollingNode::setViewportSize(const FloatSize& size)
</ins><span class="cx"> {
</span><del>- if (m_viewportConstrainedObjectRect == viewportConstrainedObjectRect)
</del><ins>+ if (m_viewportSize == size)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_viewportConstrainedObjectRect = viewportConstrainedObjectRect;
- setPropertyChanged(ViewportConstrainedObjectRect);
</del><ins>+ m_viewportSize = size;
+ setPropertyChanged(ViewportSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingStateScrollingNode::setTotalContentsSize(const IntSize& totalContentsSize)
</span><span class="lines">@@ -261,13 +261,11 @@
</span><span class="cx"> {
</span><span class="cx"> ts << "(" << "Scrolling node" << "\n";
</span><span class="cx">
</span><del>- if (!m_viewportConstrainedObjectRect.isEmpty()) {
</del><ins>+ if (!m_viewportSize.isEmpty()) {
</ins><span class="cx"> writeIndent(ts, indent + 1);
</span><span class="cx"> ts << "(viewport rect "
</span><del>- << TextStream::FormatNumberRespectingIntegers(m_viewportConstrainedObjectRect.x()) << " "
- << TextStream::FormatNumberRespectingIntegers(m_viewportConstrainedObjectRect.y()) << " "
- << TextStream::FormatNumberRespectingIntegers(m_viewportConstrainedObjectRect.width()) << " "
- << TextStream::FormatNumberRespectingIntegers(m_viewportConstrainedObjectRect.height()) << ")\n";
</del><ins>+ << TextStream::FormatNumberRespectingIntegers(m_viewportSize.width()) << " "
+ << TextStream::FormatNumberRespectingIntegers(m_viewportSize.height()) << ")\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_scrollPosition != FloatPoint()) {
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> virtual ~ScrollingStateScrollingNode();
</span><span class="cx">
</span><span class="cx"> enum ChangedProperty {
</span><del>- ViewportConstrainedObjectRect = NumStateNodeBits,
</del><ins>+ ViewportSize = NumStateNodeBits,
</ins><span class="cx"> TotalContentsSize,
</span><span class="cx"> ScrollPosition,
</span><span class="cx"> ScrollOrigin,
</span><span class="lines">@@ -70,8 +70,8 @@
</span><span class="cx"> BehaviorForFixedElements
</span><span class="cx"> };
</span><span class="cx">
</span><del>- const FloatRect& viewportConstrainedObjectRect() const { return m_viewportConstrainedObjectRect; }
- void setViewportConstrainedObjectRect(const FloatRect&);
</del><ins>+ const FloatSize& viewportSize() const { return m_viewportSize; }
+ void setViewportSize(const FloatSize&);
</ins><span class="cx">
</span><span class="cx"> const IntSize& totalContentsSize() const { return m_totalContentsSize; }
</span><span class="cx"> void setTotalContentsSize(const IntSize&);
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> RetainPtr<ScrollbarPainter> m_horizontalScrollbarPainter;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- FloatRect m_viewportConstrainedObjectRect;
</del><ins>+ FloatSize m_viewportSize;
</ins><span class="cx"> IntSize m_totalContentsSize;
</span><span class="cx"> FloatPoint m_scrollPosition;
</span><span class="cx"> IntPoint m_scrollOrigin;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> {
</span><span class="cx"> const ScrollingStateScrollingNode& state = toScrollingStateScrollingNode(stateNode);
</span><span class="cx">
</span><del>- if (state.hasChangedProperty(ScrollingStateScrollingNode::ViewportConstrainedObjectRect))
- m_viewportConstrainedObjectRect = state.viewportConstrainedObjectRect();
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::ViewportSize))
+ m_viewportSize = state.viewportSize();
</ins><span class="cx">
</span><span class="cx"> if (state.hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize)) {
</span><span class="cx"> if (scrollingTree().isRubberBandInProgress())
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> ScrollingTreeScrollingNode(ScrollingTree&, ScrollingNodeID);
</span><span class="cx">
</span><span class="cx"> const FloatPoint& scrollPosition() const { return m_scrollPosition; }
</span><del>- const FloatRect& viewportConstrainedObjectRect() const { return m_viewportConstrainedObjectRect; }
</del><ins>+ const FloatSize& viewportSize() const { return m_viewportSize; }
</ins><span class="cx"> const IntSize& totalContentsSize() const { return m_totalContentsSize; }
</span><span class="cx"> const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
</span><span class="cx">
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> ScrollBehaviorForFixedElements scrollBehaviorForFixedElements() const { return m_behaviorForFixed; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FloatRect m_viewportConstrainedObjectRect;
</del><ins>+ FloatSize m_viewportSize;
</ins><span class="cx"> IntSize m_totalContentsSize;
</span><span class="cx"> IntSize m_totalContentsSizeForRubberBand;
</span><span class="cx"> FloatPoint m_scrollPosition;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeScrollingNodeIOS.mm 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -136,8 +136,10 @@
</span><span class="cx">
</span><span class="cx"> ScrollBehaviorForFixedElements behaviorForFixed = scrollBehaviorForFixedElements();
</span><span class="cx"> FloatPoint scrollOffset = position - toIntSize(scrollOrigin());
</span><del>-
- FloatSize scrollOffsetForFixedChildren = FrameView::scrollOffsetForFixedPosition(enclosingIntRect(viewportConstrainedObjectRect()), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), frameScaleFactor(), false, behaviorForFixed, headerHeight(), footerHeight());
</del><ins>+ FloatRect viewportRect(FloatPoint(), viewportSize());
+
+ // FIXME: scrollOffsetForFixedPosition() needs to do float math.
+ FloatSize scrollOffsetForFixedChildren = FrameView::scrollOffsetForFixedPosition(enclosingLayoutRect(viewportRect), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), frameScaleFactor(), false, behaviorForFixed, headerHeight(), footerHeight());
</ins><span class="cx"> if (m_counterScrollingLayer)
</span><span class="cx"> m_counterScrollingLayer.get().position = FloatPoint(scrollOffsetForFixedChildren);
</span><span class="cx">
</span><span class="lines">@@ -147,7 +149,7 @@
</span><span class="cx"> // then we should recompute scrollOffsetForFixedChildren for the banner with a scale factor of 1.
</span><span class="cx"> float horizontalScrollOffsetForBanner = scrollOffsetForFixedChildren.width();
</span><span class="cx"> if (frameScaleFactor() != 1)
</span><del>- horizontalScrollOffsetForBanner = FrameView::scrollOffsetForFixedPosition(enclosingIntRect(viewportConstrainedObjectRect()), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), 1, false, behaviorForFixed, headerHeight(), footerHeight()).width();
</del><ins>+ horizontalScrollOffsetForBanner = FrameView::scrollOffsetForFixedPosition(enclosingLayoutRect(viewportRect), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), 1, false, behaviorForFixed, headerHeight(), footerHeight()).width();
</ins><span class="cx">
</span><span class="cx"> if (m_headerLayer)
</span><span class="cx"> m_headerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, 0);
</span><span class="lines">@@ -159,7 +161,6 @@
</span><span class="cx"> if (!m_children)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- FloatRect viewportRect = viewportConstrainedObjectRect();
</del><span class="cx"> viewportRect.setLocation(FloatPoint() + scrollOffsetForFixedChildren);
</span><span class="cx">
</span><span class="cx"> size_t size = m_children->size();
</span><span class="lines">@@ -179,8 +180,8 @@
</span><span class="cx">
</span><span class="cx"> FloatPoint ScrollingTreeScrollingNodeIOS::maximumScrollPosition() const
</span><span class="cx"> {
</span><del>- FloatPoint position(totalContentsSizeForRubberBand().width() - viewportConstrainedObjectRect().width(),
- totalContentsSizeForRubberBand().height() - viewportConstrainedObjectRect().height());
</del><ins>+ FloatPoint position(totalContentsSizeForRubberBand().width() - viewportSize().width(),
+ totalContentsSizeForRubberBand().height() - viewportSize().height());
</ins><span class="cx">
</span><span class="cx"> position = position.expandedTo(FloatPoint());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
</span><span class="cx"> setScrollPosition(scrollingStateNode.requestedScrollPosition());
</span><span class="cx">
</span><del>- if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer) || scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize) || scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ViewportConstrainedObjectRect))
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer) || scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize) || scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ViewportSize))
</ins><span class="cx"> updateMainFramePinState(scrollPosition());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -343,8 +343,12 @@
</span><span class="cx">
</span><span class="cx"> ScrollBehaviorForFixedElements behaviorForFixed = scrollBehaviorForFixedElements();
</span><span class="cx"> FloatPoint scrollOffset = position - toFloatSize(scrollOrigin());
</span><del>-
- FloatSize scrollOffsetForFixedChildren = FrameView::scrollOffsetForFixedPosition(enclosingIntRect(viewportConstrainedObjectRect()), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), frameScaleFactor(), false, behaviorForFixed, headerHeight(), footerHeight());
</del><ins>+ FloatRect viewportRect(FloatPoint(), viewportSize());
+
+ // FIXME: scrollOffsetForFixedPosition() needs to do float math.
+ FloatSize scrollOffsetForFixedChildren = FrameView::scrollOffsetForFixedPosition(enclosingLayoutRect(viewportRect),
+ totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), frameScaleFactor(), false, behaviorForFixed, headerHeight(), footerHeight());
+
</ins><span class="cx"> if (m_counterScrollingLayer)
</span><span class="cx"> m_counterScrollingLayer.get().position = FloatPoint(scrollOffsetForFixedChildren);
</span><span class="cx">
</span><span class="lines">@@ -354,7 +358,7 @@
</span><span class="cx"> // then we should recompute scrollOffsetForFixedChildren for the banner with a scale factor of 1.
</span><span class="cx"> float horizontalScrollOffsetForBanner = scrollOffsetForFixedChildren.width();
</span><span class="cx"> if (frameScaleFactor() != 1)
</span><del>- horizontalScrollOffsetForBanner = FrameView::scrollOffsetForFixedPosition(enclosingIntRect(viewportConstrainedObjectRect()), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), 1, false, behaviorForFixed, headerHeight(), footerHeight()).width();
</del><ins>+ horizontalScrollOffsetForBanner = FrameView::scrollOffsetForFixedPosition(enclosingLayoutRect(viewportRect), totalContentsSize(), flooredIntPoint(scrollOffset), scrollOrigin(), 1, false, behaviorForFixed, headerHeight(), footerHeight()).width();
</ins><span class="cx">
</span><span class="cx"> if (m_headerLayer)
</span><span class="cx"> m_headerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, 0);
</span><span class="lines">@@ -363,8 +367,6 @@
</span><span class="cx"> m_footerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, totalContentsSize().height() - footerHeight());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FloatRect viewportRect = viewportConstrainedObjectRect();
-
</del><span class="cx"> if (m_verticalScrollbarPainter || m_horizontalScrollbarPainter) {
</span><span class="cx"> [CATransaction begin];
</span><span class="cx"> [CATransaction lock];
</span><span class="lines">@@ -410,8 +412,8 @@
</span><span class="cx">
</span><span class="cx"> FloatPoint ScrollingTreeScrollingNodeMac::maximumScrollPosition() const
</span><span class="cx"> {
</span><del>- FloatPoint position(totalContentsSizeForRubberBand().width() - viewportConstrainedObjectRect().width(),
- totalContentsSizeForRubberBand().height() - viewportConstrainedObjectRect().height());
</del><ins>+ FloatPoint position(totalContentsSizeForRubberBand().width() - viewportSize().width(),
+ totalContentsSizeForRubberBand().height() - viewportSize().height());
</ins><span class="cx">
</span><span class="cx"> position = position.expandedTo(FloatPoint());
</span><span class="cx">
</span><span class="lines">@@ -466,7 +468,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatPoint scrollPosition = this->scrollPosition();
</span><del>- unsigned unfilledArea = TileController::blankPixelCountForTiles(tiles, viewportConstrainedObjectRect(), IntPoint(-scrollPosition.x(), -scrollPosition.y()));
</del><ins>+ FloatRect viewPortRect(scrollPosition, viewportSize());
+ unsigned unfilledArea = TileController::blankPixelCountForTiles(tiles, viewPortRect, IntPoint(-scrollPosition.x(), -scrollPosition.y()));
</ins><span class="cx">
</span><span class="cx"> if (unfilledArea || m_lastScrollHadUnfilledPixels)
</span><span class="cx"> WTFLogAlways("SCROLLING: Exposed tileless area. Time: %f Unfilled Pixels: %u\n", WTF::monotonicallyIncreasingTime(), unfilledArea);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-12 Simon Fraser <simon.fraser@apple.com>
+
+ Have the scrolling tree track the viewport size, not the viewport rect
+ https://bugs.webkit.org/show_bug.cgi?id=130141
+
+ Reviewed by Beth Dakin.
+
+ The scrolling tree only needs to know the size of the viewport, not its
+ origin, since the origin is deduced from the updated scroll position.
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (ArgumentCoder<ScrollingStateScrollingNode>::encode):
+ (ArgumentCoder<ScrollingStateScrollingNode>::decode):
+
</ins><span class="cx"> 2014-03-12 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r165481.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (165492 => 165493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-03-12 18:55:25 UTC (rev 165492)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-03-12 18:55:53 UTC (rev 165493)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> {
</span><span class="cx"> encoder << static_cast<const ScrollingStateNode&>(node);
</span><span class="cx">
</span><del>- SCROLLING_NODE_ENCODE(ViewportConstrainedObjectRect, viewportConstrainedObjectRect)
</del><ins>+ SCROLLING_NODE_ENCODE(ViewportSize, viewportSize)
</ins><span class="cx"> SCROLLING_NODE_ENCODE(TotalContentsSize, totalContentsSize)
</span><span class="cx"> SCROLLING_NODE_ENCODE(ScrollPosition, scrollPosition)
</span><span class="cx"> SCROLLING_NODE_ENCODE(ScrollOrigin, scrollOrigin)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> if (!decoder.decode(static_cast<ScrollingStateNode&>(node)))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- SCROLLING_NODE_DECODE(ViewportConstrainedObjectRect, FloatRect, setViewportConstrainedObjectRect);
</del><ins>+ SCROLLING_NODE_DECODE(ViewportSize, FloatSize, setViewportSize);
</ins><span class="cx"> SCROLLING_NODE_DECODE(TotalContentsSize, IntSize, setTotalContentsSize);
</span><span class="cx"> SCROLLING_NODE_DECODE(ScrollPosition, FloatPoint, setScrollPosition);
</span><span class="cx"> SCROLLING_NODE_DECODE(ScrollOrigin, IntPoint, setScrollOrigin);
</span></span></pre>
</div>
</div>
</body>
</html>