Changeset 217591 in webkit

Timestamp:

May 30, 2017 10:48:57 PM (7 years ago)

Author:

fred.wang@free.fr

Message:

Include ScrollingTreeScrollingNode properties in ScrollingTreeFrameScrollingNode::dumpProperties
​https://bugs.webkit.org/show_bug.cgi?id=172287

Patch by Frederic Wang <​fwang@igalia.com> on 2017-05-30
Reviewed by Simon Fraser.

Source/WebCore:

No new tests, only changes in dumped tree.

• page/scrolling/ScrollingTreeFrameScrollingNode.cpp:

(WebCore::ScrollingTreeFrameScrollingNode::dumpProperties): Print properties of the parent class.

LayoutTests:

Update iOS expectation to include the new node properties.

• scrollingcoordinator/ios/ui-scrolling-tree-expected.txt: Update expectation.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/scrollingcoordinator/ios/ui-scrolling-tree-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-05-30  Frederic Wang  <fwang@igalia.com>
+
+        Include ScrollingTreeScrollingNode properties in ScrollingTreeFrameScrollingNode::dumpProperties
+        https://bugs.webkit.org/show_bug.cgi?id=172287
+
+        Reviewed by Simon Fraser.
+
+        Update iOS expectation to include the new node properties.
+
+        * scrollingcoordinator/ios/ui-scrolling-tree-expected.txt: Update expectation.
+
 2017-05-30  Tim Horton  <timothy_horton@apple.com>
 

trunk/LayoutTests/scrollingcoordinator/ios/ui-scrolling-tree-expected.txt

@@ -2 +2 @@
 (scrolling tree
   (frame scrolling node
+    (scrollable area size width=320 height=548)
+    (total content size width=1308 height=2021)
+    (last committed scroll position (0,0))
+    (scrollable area parameters 
+      (horizontal scroll elasticity 1)
+      (vertical scroll elasticity 1)
+      (horizontal scrollbar mode 0)
+      (vertical scrollbar mode 0))
     (layout viewport (0,0) width=320 height=548)
     (min layoutViewport origin (0,0))

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-05-30  Frederic Wang  <fwang@igalia.com>
+
+        Include ScrollingTreeScrollingNode properties in ScrollingTreeFrameScrollingNode::dumpProperties
+        https://bugs.webkit.org/show_bug.cgi?id=172287
+
+        Reviewed by Simon Fraser.
+
+        No new tests, only changes in dumped tree.
+
+        * page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
+        (WebCore::ScrollingTreeFrameScrollingNode::dumpProperties): Print properties of the parent class.
+
 2017-05-30  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp

@@ -127 +127 @@
 }
 
-void ScrollingTreeFrameScrollingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior) const
+void ScrollingTreeFrameScrollingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
 {
     ts << "frame scrolling node";
+    ScrollingTreeScrollingNode::dumpProperties(ts, behavior);
 
     ts.dumpProperty("layout viewport", m_layoutViewport);