Diff
Modified: trunk/LayoutTests/ChangeLog (170266 => 170267)
--- trunk/LayoutTests/ChangeLog 2014-06-22 17:49:01 UTC (rev 170266)
+++ trunk/LayoutTests/ChangeLog 2014-06-22 18:06:35 UTC (rev 170267)
@@ -1,3 +1,18 @@
+2014-06-20 Simon Fraser <[email protected]>
+
+ 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:
+
2014-06-21 Dean Jackson <[email protected]>
[Mac] Margins for new form controls need tweaking
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt (170266 => 170267)
--- 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)
@@ -2,6 +2,8 @@
(scrollable area size 785 600)
(contents size 785 2213)
(requested scroll position 0 200)
+ (non-fast-scrollable region
+ at (0,13) size 204x204)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt (170266 => 170267)
--- 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)
@@ -1,6 +1,9 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1016)
+ (non-fast-scrollable region
+ at (37,39) size 500x300
+ at (45,339) size 404x12)
(children 1
(Frame scrolling node
(scrollable area size 485 300)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt (170266 => 170267)
--- 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)
@@ -1,6 +1,8 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1016)
+ (non-fast-scrollable region
+ at (45,47) size 404x304)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt (170266 => 170267)
--- 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)
@@ -1,6 +1,9 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1016)
+ (non-fast-scrollable region
+ at (37,29) size 500x300
+ at (45,329) size 404x12)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt (170266 => 170267)
--- 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)
@@ -1,6 +1,8 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1016)
+ (non-fast-scrollable region
+ at (45,47) size 404x304)
(children 1
(Frame scrolling node
(scrollable area size 500 300)
Modified: trunk/Source/WebCore/ChangeLog (170266 => 170267)
--- 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)
@@ -1,3 +1,16 @@
+2014-06-20 Simon Fraser <[email protected]>
+
+ 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):
+
2014-06-20 Myles C. Maxfield <[email protected]>
Use unsigneds instead of ints for indexes into a string in text layout code
Modified: trunk/Source/WebCore/WebCore.exp.in (170266 => 170267)
--- 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)
@@ -107,6 +107,7 @@
__ZN7WebCore10TextStreamlsEPKv
__ZN7WebCore10TextStreamlsERKN3WTF6StringE
__ZN7WebCore10TextStreamlsERKNS_10FloatPointE
+__ZN7WebCore10TextStreamlsERKNS_7IntRectE
__ZN7WebCore10TextStreamlsERKNS_8IntPointE
__ZN7WebCore10TextStreamlsERKNS_9FloatSizeE
__ZN7WebCore10TextStreamlsEb
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp (170266 => 170267)
--- 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)
@@ -244,6 +244,20 @@
writeIndent(ts, indent + 1);
ts << "(frame scale factor " << m_frameScaleFactor << ")\n";
}
+
+ 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;
+ }
if (m_synchronousScrollingReasons) {
writeIndent(ts, indent + 1);
Modified: trunk/Source/WebKit2/ChangeLog (170266 => 170267)
--- 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)
@@ -1,3 +1,15 @@
+2014-06-20 Simon Fraser <[email protected]>
+
+ 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):
+
2014-06-22 Anders Carlsson <[email protected]>
Add IPC decoding support to BackForwardListState
Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (170266 => 170267)
--- 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)
@@ -592,7 +592,22 @@
if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::FrameScaleFactor))
dumpProperty(ts, "frame-scale-factor", node.frameScaleFactor());
- // FIXME: dump nonFastScrollableRegion
+ 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();
+ }
+
// FIXME: dump wheelEventHandlerCount
// FIXME: dump synchronousScrollingReasons
// FIXME: dump scrollableAreaParameters
