<!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>[170267] 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/170267">170267</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-06-22 11:06:35 -0700 (Sun, 22 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have scrollingTreeAsText() dump the non-fast-scrollable region
https://bugs.webkit.org/show_bug.cgi?id=134149
Reviewed by Sam Weinig.
Source/WebCore:
Dump the non-fast-scrollable region (as an array of rects).
* WebCore.exp.in:
* page/scrolling/ScrollingStateFrameScrollingNode.cpp:
(WebCore::ScrollingStateFrameScrollingNode::dumpProperties):
Source/WebKit2:
Dump the non-fast-scrollable region (as an array of rects).
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(WebKit::RemoteScrollingTreeTextStream::dump):
LayoutTests:
Rebaselined.
* platform/mac-wk2/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt:
* platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingfixedfixedinoverflowexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframegainscrollingancestorexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframeinfixedexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframelosescrollingancestorexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-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="#trunkSourceWebCorepagescrollingScrollingStateFrameScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp</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 (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/LayoutTests/ChangeLog 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-06-20 Simon Fraser <simon.fraser@apple.com>
+
+ Have scrollingTreeAsText() dump the non-fast-scrollable region
+ https://bugs.webkit.org/show_bug.cgi?id=134149
+
+ Reviewed by Sam Weinig.
+
+ Rebaselined.
+
+ * platform/mac-wk2/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt:
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt:
+
</ins><span class="cx"> 2014-06-21 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Margins for new form controls need tweaking
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingfixedfixedinoverflowexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -2,6 +2,8 @@
</span><span class="cx"> (scrollable area size 785 600)
</span><span class="cx"> (contents size 785 2213)
</span><span class="cx"> (requested scroll position 0 200)
</span><ins>+ (non-fast-scrollable region
+ at (0,13) size 204x204)
</ins><span class="cx"> (children 1
</span><span class="cx"> (Fixed node
</span><span class="cx"> (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -1,6 +1,9 @@
</span><span class="cx"> (Frame scrolling node
</span><span class="cx"> (scrollable area size 785 600)
</span><span class="cx"> (contents size 785 1016)
</span><ins>+ (non-fast-scrollable region
+ at (37,39) size 500x300
+ at (45,339) size 404x12)
</ins><span class="cx"> (children 1
</span><span class="cx"> (Frame scrolling node
</span><span class="cx"> (scrollable area size 485 300)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframegainscrollingancestorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> (Frame scrolling node
</span><span class="cx"> (scrollable area size 785 600)
</span><span class="cx"> (contents size 785 1016)
</span><ins>+ (non-fast-scrollable region
+ at (45,47) size 404x304)
</ins><span class="cx"> (children 1
</span><span class="cx"> (Fixed node
</span><span class="cx"> (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframeinfixedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -1,6 +1,9 @@
</span><span class="cx"> (Frame scrolling node
</span><span class="cx"> (scrollable area size 785 600)
</span><span class="cx"> (contents size 785 1016)
</span><ins>+ (non-fast-scrollable region
+ at (37,29) size 500x300
+ at (45,329) size 404x12)
</ins><span class="cx"> (children 1
</span><span class="cx"> (Fixed node
</span><span class="cx"> (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframescoordinatedframelosescrollingancestorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> (Frame scrolling node
</span><span class="cx"> (scrollable area size 785 600)
</span><span class="cx"> (contents size 785 1016)
</span><ins>+ (non-fast-scrollable region
+ at (45,47) size 404x304)
</ins><span class="cx"> (children 1
</span><span class="cx"> (Frame scrolling node
</span><span class="cx"> (scrollable area size 500 300)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/Source/WebCore/ChangeLog 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-06-20 Simon Fraser <simon.fraser@apple.com>
+
+ Have scrollingTreeAsText() dump the non-fast-scrollable region
+ https://bugs.webkit.org/show_bug.cgi?id=134149
+
+ Reviewed by Sam Weinig.
+
+ Dump the non-fast-scrollable region (as an array of rects).
+
+ * WebCore.exp.in:
+ * page/scrolling/ScrollingStateFrameScrollingNode.cpp:
+ (WebCore::ScrollingStateFrameScrollingNode::dumpProperties):
+
</ins><span class="cx"> 2014-06-20 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Use unsigneds instead of ints for indexes into a string in text layout code
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> __ZN7WebCore10TextStreamlsEPKv
</span><span class="cx"> __ZN7WebCore10TextStreamlsERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore10TextStreamlsERKNS_10FloatPointE
</span><ins>+__ZN7WebCore10TextStreamlsERKNS_7IntRectE
</ins><span class="cx"> __ZN7WebCore10TextStreamlsERKNS_8IntPointE
</span><span class="cx"> __ZN7WebCore10TextStreamlsERKNS_9FloatSizeE
</span><span class="cx"> __ZN7WebCore10TextStreamlsEb
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateFrameScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -244,6 +244,20 @@
</span><span class="cx"> writeIndent(ts, indent + 1);
</span><span class="cx"> ts << "(frame scale factor " << m_frameScaleFactor << ")\n";
</span><span class="cx"> }
</span><ins>+
+ if (!m_nonFastScrollableRegion.isEmpty()) {
+ ++indent;
+ writeIndent(ts, indent);
+ ts << "(non-fast-scrollable region";
+ ++indent;
+ for (auto rect : m_nonFastScrollableRegion.rects()) {
+ ts << "\n";
+ writeIndent(ts, indent);
+ ts << rect;
+ }
+ ts << ")\n";
+ indent -= 2;
+ }
</ins><span class="cx">
</span><span class="cx"> if (m_synchronousScrollingReasons) {
</span><span class="cx"> writeIndent(ts, indent + 1);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-20 Simon Fraser <simon.fraser@apple.com>
+
+ Have scrollingTreeAsText() dump the non-fast-scrollable region
+ https://bugs.webkit.org/show_bug.cgi?id=134149
+
+ Reviewed by Sam Weinig.
+
+ Dump the non-fast-scrollable region (as an array of rects).
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (WebKit::RemoteScrollingTreeTextStream::dump):
+
</ins><span class="cx"> 2014-06-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add IPC decoding support to BackForwardListState
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (170266 => 170267)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-06-22 18:06:35 UTC (rev 170267)
</span><span class="lines">@@ -592,7 +592,22 @@
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::FrameScaleFactor))
</span><span class="cx"> dumpProperty(ts, "frame-scale-factor", node.frameScaleFactor());
</span><span class="cx">
</span><del>- // FIXME: dump nonFastScrollableRegion
</del><ins>+ if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::NonFastScrollableRegion)) {
+ ts << "\n";
+ ts.increaseIndent();
+ ts.writeIndent();
+ ts << "(non-fast-scrollable-region";
+ ts.increaseIndent();
+ for (auto rect : node.nonFastScrollableRegion().rects()) {
+ ts << "\n";
+ ts.writeIndent();
+ ts << rect;
+ }
+ ts << ")\n";
+ ts.decreaseIndent();
+ ts.decreaseIndent();
+ }
+
</ins><span class="cx"> // FIXME: dump wheelEventHandlerCount
</span><span class="cx"> // FIXME: dump synchronousScrollingReasons
</span><span class="cx"> // FIXME: dump scrollableAreaParameters
</span></span></pre>
</div>
</div>
</body>
</html>