Diff
Modified: trunk/LayoutTests/ChangeLog (216510 => 216511)
--- trunk/LayoutTests/ChangeLog 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/ChangeLog 2017-05-09 17:10:58 UTC (rev 216511)
@@ -1,3 +1,42 @@
+2017-05-09 Frederic Wang <fw...@igalia.com>
+
+ Print more properties in the output of scrolling trees
+ https://bugs.webkit.org/show_bug.cgi?id=171858
+
+ Reviewed by Simon Fraser.
+
+ Update text expectations to include new properties.
+
+ * fast/scrolling/ios/remove-scrolling-role-expected.txt:
+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt:
+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt:
+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt:
+ * tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt:
+ * tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt:
+ * tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt:
+ * tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt:
+ * tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt:
+ * tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt:
+ * tiled-drawing/scrolling/fixed/four-bars-expected.txt:
+ * tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt:
+ * tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt:
+ * tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt:
+ * tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt:
+ * tiled-drawing/scrolling/fixed/nested-fixed-expected.txt:
+ * tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt:
+ * tiled-drawing/scrolling/frames/coordinated-frame-expected.txt:
+ * tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt:
+ * tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt:
+ * tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt:
+ * tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt:
+ * tiled-drawing/scrolling/frames/remove-coordinated-frame-expected.txt:
+ * tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt:
+ * tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt:
+ * tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt:
+ * tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt:
+ * tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt:
+ * tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt:
+
2017-05-09 Chris Dumez <cdu...@apple.com>
ontransitionend eventHandler should be in GlobalEventHandlers
Modified: trunk/LayoutTests/fast/scrolling/ios/remove-scrolling-role-expected.txt (216510 => 216511)
--- trunk/LayoutTests/fast/scrolling/ios/remove-scrolling-role-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/fast/scrolling/ios/remove-scrolling-role-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,13 +2,25 @@
(Frame scrolling node
(scrollable area size 800 600)
(contents size 800 2513)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 800x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1913))
+ (behavior for fixed 0)
(children 1
(Overflow scrolling node
(scrollable area size 300 400)
(contents size 300 2000)
+ (scrollable area parameters
+ (horizontal scroll elasticity 1)
+ (vertical scroll elasticity 1)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
)
)
)
Modified: trunk/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt (216510 => 216511)
--- trunk/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,10 +3,20 @@
(scrollable area size 785 585)
(contents size 4016 4042)
(requested scroll position 40 1000)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
(frame scale factor 2.00)
+ (visual viewport enabled 1)
(layout viewport at (0,207.50) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (1223,1436))
+ (behavior for fixed 0)
(children 4
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt (216510 => 216511)
--- trunk/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,10 +3,20 @@
(scrollable area size 785 585)
(contents size 4016 4042)
(requested scroll position 40 460)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
(frame scale factor 2.00)
+ (visual viewport enabled 1)
(layout viewport at (0,230) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (1223,1436))
+ (behavior for fixed 0)
(children 4
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt (216510 => 216511)
--- trunk/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,10 +2,19 @@
(Frame scrolling node
(scrollable area size 785 585)
(contents size 4016 4042)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
(frame scale factor 2.00)
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (1223,1436))
+ (behavior for fixed 0)
(children 4
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,9 +3,18 @@
(Frame scrolling node
(scrollable area size 785 585)
(contents size 5008 5021)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (4223,4436))
+ (behavior for fixed 0)
)
Attempted scroll to 0, -5000
@@ -13,9 +22,18 @@
(Frame scrolling node
(scrollable area size 785 585)
(contents size 5008 5021)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (4223,4436))
+ (behavior for fixed 0)
)
Attempted scroll to -5000, -5000
@@ -23,9 +41,18 @@
(Frame scrolling node
(scrollable area size 785 585)
(contents size 5008 5021)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (4223,4436))
+ (behavior for fixed 0)
)
Attempted scroll to 10000, 0
@@ -34,9 +61,19 @@
(scrollable area size 785 585)
(contents size 5008 5021)
(requested scroll position 4223 0)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (4223,4436))
+ (behavior for fixed 0)
)
Attempted scroll to 0, 10000
@@ -45,9 +82,19 @@
(scrollable area size 785 585)
(contents size 5008 5021)
(requested scroll position 0 4436)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (4223,0) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (4223,4436))
+ (behavior for fixed 0)
)
Attempted scroll to 10000, 10000
@@ -56,9 +103,19 @@
(scrollable area size 785 585)
(contents size 5008 5021)
(requested scroll position 4223 4436)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,4436) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (4223,4436))
+ (behavior for fixed 0)
)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,9 +3,18 @@
(scrollable area size 785 600)
(contents size 785 2710)
(requested scroll position 0 200)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,200) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,2110))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,9 +3,18 @@
(scrollable area size 785 600)
(contents size 785 2513)
(requested scroll position 0 200)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,200) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1913))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,11 +3,20 @@
(scrollable area size 785 600)
(contents size 785 2213)
(requested scroll position 0 200)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,200) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1613))
(synchronous event dispatch region for event wheel
at (0,13) size 204x204)
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,9 +2,17 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1021)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,421))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,9 +2,17 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1021)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,421))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,9 +3,18 @@
(scrollable area size 785 600)
(contents size 785 2221)
(requested scroll position 0 200)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,200) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1621))
+ (behavior for fixed 0)
(children 4
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,9 +3,20 @@
(scrollable area size 785 600)
(contents size 785 2421)
(requested scroll position 0 200)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (header height 100)
+ (footer height 100)
+ (visual viewport enabled 1)
(layout viewport at (0,100) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1621))
+ (behavior for fixed 0)
(children 4
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,10 +2,19 @@
(Frame scrolling node
(scrollable area size 785 585)
(contents size 1805 5108)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1)
+ (has enabled vertical scrollbar 1))
(frame scale factor 2.30)
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x585)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1636))
+ (behavior for fixed 0)
(children 4
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,9 +2,17 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 2221)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1621))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,9 +2,17 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 2221)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1621))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeBottom)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,9 +3,18 @@
(scrollable area size 785 600)
(contents size 785 2213)
(requested scroll position 0 200)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,200) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1613))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,9 +3,18 @@
(scrollable area size 785 600)
(contents size 785 2513)
(requested scroll position 0 200)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,200) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1913))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,18 +2,34 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1016)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,416))
(synchronous event dispatch region for event wheel
at (45,47) size 404x304)
+ (behavior for fixed 0)
(children 1
(Frame scrolling node
(scrollable area size 485 300)
(contents size 485 420)
+ (scrollable area parameters
+ (horizontal scroll elasticity 0)
+ (vertical scroll elasticity 0)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 485x300)
(min layout viewport origin (0,0))
(max layout viewport origin (0,120))
+ (behavior for fixed 0)
(children 1
(Sticky node
(anchor edges: AnchorEdgeTop AnchorEdgeBottom)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-gain-scrolling-ancestor-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,11 +2,19 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1016)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,416))
(synchronous event dispatch region for event wheel
at (45,47) size 404x304)
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
@@ -16,9 +24,16 @@
(Frame scrolling node
(scrollable area size 500 300)
(contents size 500 420)
+ (scrollable area parameters
+ (horizontal scroll elasticity 0)
+ (vertical scroll elasticity 0)
+ (horizontal scrollbar mode 1)
+ (vertical scrollbar mode 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 500x300)
(min layout viewport origin (0,0))
(max layout viewport origin (0,120))
+ (behavior for fixed 0)
(children 1
(Sticky node
(anchor edges: AnchorEdgeTop AnchorEdgeBottom)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-in-fixed-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,11 +2,19 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1016)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,416))
(synchronous event dispatch region for event wheel
at (45,37) size 404x304)
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
@@ -16,9 +24,17 @@
(Frame scrolling node
(scrollable area size 485 300)
(contents size 485 420)
+ (scrollable area parameters
+ (horizontal scroll elasticity 0)
+ (vertical scroll elasticity 0)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 485x300)
(min layout viewport origin (0,0))
(max layout viewport origin (0,120))
+ (behavior for fixed 0)
(children 1
(Sticky node
(anchor edges: AnchorEdgeTop AnchorEdgeBottom)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/coordinated-frame-lose-scrolling-ancestor-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,18 +2,33 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1016)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,416))
(synchronous event dispatch region for event wheel
at (45,47) size 404x304)
+ (behavior for fixed 0)
(children 1
(Frame scrolling node
(scrollable area size 500 300)
(contents size 500 420)
+ (scrollable area parameters
+ (horizontal scroll elasticity 0)
+ (vertical scroll elasticity 0)
+ (horizontal scrollbar mode 1)
+ (vertical scrollbar mode 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 500x300)
(min layout viewport origin (0,0))
(max layout viewport origin (0,120))
+ (behavior for fixed 0)
(children 1
(Sticky node
(anchor edges: AnchorEdgeTop AnchorEdgeBottom)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,17 +3,34 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 657)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,57))
+ (behavior for fixed 0)
(children 1
(Frame scrolling node
(scrollable area size 465 400)
(contents size 465 1016)
(requested scroll position 0 120)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 0)
+ (vertical scroll elasticity 0)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,120) size 465x400)
(min layout viewport origin (0,0))
(max layout viewport origin (0,616))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/remove-coordinated-frame-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,9 +2,17 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 1016)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,416))
+ (behavior for fixed 0)
(children 1
(Fixed node
(anchor edges: AnchorEdgeLeft AnchorEdgeTop)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,10 +3,18 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 757)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,157))
(synchronous event dispatch region for event wheel
at (68,68) size 300x300)
+ (behavior for fixed 0)
)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -3,8 +3,17 @@
(scrollable area size 785 600)
(contents size 785 5021)
(requested scroll position 0 3000)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,4421))
+ (behavior for fixed 0)
)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,9 +2,16 @@
(Frame scrolling node
(scrollable area size 800 600)
(contents size 800 600)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 800x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,0))
(Scrolling on main thread because: Has slow repaint objects)
+ (behavior for fixed 0)
)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -2,9 +2,17 @@
(Frame scrolling node
(scrollable area size 785 600)
(contents size 785 2216)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,0) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,1616))
+ (behavior for fixed 0)
(children 1
(Sticky node
(anchor edges: AnchorEdgeLeft AnchorEdgeRight AnchorEdgeBottom)
Modified: trunk/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -4,9 +4,18 @@
(scrollable area size 800 585)
(contents size 2008 585)
(requested scroll position 800 0)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled horizontal scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (800,0) size 800x585)
(min layout viewport origin (0,0))
(max layout viewport origin (1208,0))
+ (behavior for fixed 0)
(children 6
(Sticky node
(anchor edges: AnchorEdgeLeft )
Modified: trunk/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt (216510 => 216511)
--- trunk/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt 2017-05-09 17:10:58 UTC (rev 216511)
@@ -8,9 +8,18 @@
(scrollable area size 785 600)
(contents size 785 2908)
(requested scroll position 0 580)
+ (requested scroll position represents programmatic scroll 1)
+ (scrollable area parameters
+ (horizontal scroll elasticity 2)
+ (vertical scroll elasticity 2)
+ (horizontal scrollbar mode 0)
+ (vertical scrollbar mode 0)
+ (has enabled vertical scrollbar 1))
+ (visual viewport enabled 1)
(layout viewport at (0,580) size 785x600)
(min layout viewport origin (0,0))
(max layout viewport origin (0,2308))
+ (behavior for fixed 0)
(children 6
(Sticky node
(anchor edges: AnchorEdgeTop )
Modified: trunk/Source/WebCore/ChangeLog (216510 => 216511)
--- trunk/Source/WebCore/ChangeLog 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/Source/WebCore/ChangeLog 2017-05-09 17:10:58 UTC (rev 216511)
@@ -1,3 +1,22 @@
+2017-05-09 Frederic Wang <fw...@igalia.com>
+
+ Print more properties in the output of scrolling trees
+ https://bugs.webkit.org/show_bug.cgi?id=171858
+
+ Reviewed by Simon Fraser.
+
+ No new tests, no behavior changes.
+
+ * page/scrolling/ScrollingCoordinator.cpp: Implement << operator to print ScrollableAreaParameters.
+ (WebCore::operator<<):
+ * page/scrolling/ScrollingCoordinator.h: Declare new << operator.
+ * page/scrolling/ScrollingStateFrameScrollingNode.cpp: Print new properties.
+ (WebCore::ScrollingStateFrameScrollingNode::dumpProperties):
+ * page/scrolling/ScrollingStateScrollingNode.cpp: ditto.
+ (WebCore::ScrollingStateScrollingNode::dumpProperties):
+ * page/scrolling/ScrollingTreeScrollingNode.cpp: ditto.
+ (WebCore::ScrollingTreeScrollingNode::dumpProperties):
+
2017-05-09 Chris Dumez <cdu...@apple.com>
ontransitionend eventHandler should be in GlobalEventHandlers
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (216510 => 216511)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2017-05-09 17:10:58 UTC (rev 216511)
@@ -419,6 +419,20 @@
return String();
}
+TextStream& operator<<(TextStream& ts, ScrollableAreaParameters scrollableAreaParameters)
+{
+ ts.dumpProperty("horizontal scroll elasticity", scrollableAreaParameters.horizontalScrollElasticity);
+ ts.dumpProperty("vertical scroll elasticity", scrollableAreaParameters.verticalScrollElasticity);
+ ts.dumpProperty("horizontal scrollbar mode", scrollableAreaParameters.horizontalScrollbarMode);
+ ts.dumpProperty("vertical scrollbar mode", scrollableAreaParameters.verticalScrollbarMode);
+ if (scrollableAreaParameters.hasEnabledHorizontalScrollbar)
+ ts.dumpProperty("has enabled horizontal scrollbar", scrollableAreaParameters.hasEnabledHorizontalScrollbar);
+ if (scrollableAreaParameters.hasEnabledVerticalScrollbar)
+ ts.dumpProperty("has enabled vertical scrollbar", scrollableAreaParameters.hasEnabledVerticalScrollbar);
+
+ return ts;
+}
+
TextStream& operator<<(TextStream& ts, ScrollingNodeType nodeType)
{
switch (nodeType) {
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (216510 => 216511)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2017-05-09 17:10:58 UTC (rev 216511)
@@ -244,6 +244,7 @@
bool m_forceSynchronousScrollLayerPositionUpdates { false };
};
+WEBCORE_EXPORT TextStream& operator<<(TextStream&, ScrollableAreaParameters);
WEBCORE_EXPORT TextStream& operator<<(TextStream&, ScrollingNodeType);
WEBCORE_EXPORT TextStream& operator<<(TextStream&, ScrollingLayerPositionAction);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp (216510 => 216511)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2017-05-09 17:10:58 UTC (rev 216511)
@@ -268,10 +268,26 @@
ScrollingStateScrollingNode::dumpProperties(ts, behavior);
+ if (behavior & ScrollingStateTreeAsTextBehaviorIncludeLayerIDs) {
+ ts.dumpProperty("counter scrolling layer ID", m_counterScrollingLayer.layerID());
+ ts.dumpProperty("inset clip layer ID", m_insetClipLayer.layerID());
+ ts.dumpProperty("scrolled contents layer ID", m_scrolledContentsLayer.layerID());
+ ts.dumpProperty("content shadow layer ID", m_contentShadowLayer.layerID());
+ ts.dumpProperty("header layer ID", m_headerLayer.layerID());
+ ts.dumpProperty("footer layer ID", m_footerLayer.layerID());
+ }
+
if (m_frameScaleFactor != 1)
ts.dumpProperty("frame scale factor", m_frameScaleFactor);
+ if (m_topContentInset)
+ ts.dumpProperty("top content inset", m_topContentInset);
+ if (m_headerHeight)
+ ts.dumpProperty("header height", m_headerHeight);
+ if (m_footerHeight)
+ ts.dumpProperty("footer height", m_footerHeight);
if (m_visualViewportEnabled) {
+ ts.dumpProperty("visual viewport enabled", m_visualViewportEnabled);
ts.dumpProperty("layout viewport", m_layoutViewport);
ts.dumpProperty("min layout viewport origin", m_minLayoutViewportOrigin);
ts.dumpProperty("max layout viewport origin", m_maxLayoutViewportOrigin);
@@ -305,7 +321,15 @@
if (m_synchronousScrollingReasons)
ts.dumpProperty("Scrolling on main thread because:", ScrollingCoordinator::synchronousScrollingReasonsAsText(m_synchronousScrollingReasons));
- // FIXME: dump more properties.
+ ts.dumpProperty("behavior for fixed", m_behaviorForFixed);
+
+ if (m_requestedScrollPosition != FloatPoint())
+ ts.dumpProperty("requested scroll position", m_requestedScrollPosition);
+ if (m_requestedScrollPositionRepresentsProgrammaticScroll)
+ ts.dumpProperty("requested scroll position represents programmatic scroll", m_requestedScrollPositionRepresentsProgrammaticScroll);
+
+ if (m_fixedElementsLayoutRelativeToFrame)
+ ts.dumpProperty("fixed elements lay out relative to frame", m_fixedElementsLayoutRelativeToFrame);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (216510 => 216511)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2017-05-09 17:10:58 UTC (rev 216511)
@@ -210,6 +210,9 @@
<< TextStream::FormatNumberRespectingIntegers(m_totalContentsSize.height());
}
+ if (m_reachableContentsSize != m_totalContentsSize)
+ ts.dumpProperty("reachable contents size", m_reachableContentsSize);
+
if (m_requestedScrollPosition != IntPoint()) {
TextStream::GroupScope scope(ts);
ts << "requested scroll position "
@@ -216,9 +219,30 @@
<< TextStream::FormatNumberRespectingIntegers(m_requestedScrollPosition.x()) << " "
<< TextStream::FormatNumberRespectingIntegers(m_requestedScrollPosition.y());
}
+ if (m_requestedScrollPositionRepresentsProgrammaticScroll)
+ ts.dumpProperty("requested scroll position represents programmatic scroll", m_requestedScrollPositionRepresentsProgrammaticScroll);
if (m_scrollOrigin != IntPoint())
ts.dumpProperty("scroll origin", m_scrollOrigin);
+
+#if ENABLE(CSS_SCROLL_SNAP)
+ if (m_snapOffsetsInfo.horizontalSnapOffsets.size())
+ ts.dumpProperty("horizontal snap offsets", m_snapOffsetsInfo.horizontalSnapOffsets);
+
+ if (m_snapOffsetsInfo.verticalSnapOffsets.size())
+ ts.dumpProperty("vertical snap offsets", m_snapOffsetsInfo.verticalSnapOffsets);
+
+ if (m_currentHorizontalSnapPointIndex)
+ ts.dumpProperty("current horizontal snap point index", m_currentHorizontalSnapPointIndex);
+
+ if (m_currentVerticalSnapPointIndex)
+ ts.dumpProperty("current vertical snap point index", m_currentVerticalSnapPointIndex);
+#endif
+
+ ts.dumpProperty("scrollable area parameters", m_scrollableAreaParameters);
+
+ if (m_expectsWheelEventTestTrigger)
+ ts.dumpProperty("expects wheel event test trigger", m_expectsWheelEventTestTrigger);
}
} // namespace WebCore
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (216510 => 216511)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2017-05-09 16:51:00 UTC (rev 216510)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2017-05-09 17:10:58 UTC (rev 216511)
@@ -158,6 +158,8 @@
ts.dumpProperty("current vertical snap point index", m_currentVerticalSnapPointIndex);
#endif
+
+ ts.dumpProperty("scrollable area parameters", m_scrollableAreaParameters);
}
} // namespace WebCore
