Changeset 243846 in webkit

Timestamp:

Apr 3, 2019, 7:52:58 PM (6 years ago)

Author:

Simon Fraser

Message:

Remove some redundant memebers from ScrollingStateFrameScrollingNode
​https://bugs.webkit.org/show_bug.cgi?id=196571

Reviewed by Zalan Bujtas.

m_requestedScrollPosition and m_requestedScrollPositionRepresentsProgrammaticScroll were
duplicated on ScrollingStateFrameScrollingNode and ScrollingStateScrollingNode, so
remove them from the derived class.

• page/scrolling/ScrollingStateFrameScrollingNode.cpp:

(WebCore::ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode):
(WebCore::ScrollingStateFrameScrollingNode::dumpProperties const):

• page/scrolling/ScrollingStateFrameScrollingNode.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingStateFrameScrollingNode.cpp (modified) (3 diffs)
• page/scrolling/ScrollingStateFrameScrollingNode.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Remove some redundant memebers from ScrollingStateFrameScrollingNode
+        https://bugs.webkit.org/show_bug.cgi?id=196571
+
+        Reviewed by Zalan Bujtas.
+
+        m_requestedScrollPosition and m_requestedScrollPositionRepresentsProgrammaticScroll were
+        duplicated on ScrollingStateFrameScrollingNode and ScrollingStateScrollingNode, so
+        remove them from the derived class.
+
+        * page/scrolling/ScrollingStateFrameScrollingNode.cpp:
+        (WebCore::ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode):
+        (WebCore::ScrollingStateFrameScrollingNode::dumpProperties const):
+        * page/scrolling/ScrollingStateFrameScrollingNode.h:
+
 2019-04-03  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

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

@@ -48 +48 @@
     : ScrollingStateScrollingNode(stateNode, adoptiveTree)
     , m_eventTrackingRegions(stateNode.eventTrackingRegions())
-    , m_requestedScrollPosition(stateNode.requestedScrollPosition())
     , m_layoutViewport(stateNode.layoutViewport())
     , m_minLayoutViewportOrigin(stateNode.minLayoutViewportOrigin())
@@ -58 +57 @@
     , m_synchronousScrollingReasons(stateNode.synchronousScrollingReasons())
     , m_behaviorForFixed(stateNode.scrollBehaviorForFixedElements())
-    , m_requestedScrollPositionRepresentsProgrammaticScroll(stateNode.requestedScrollPositionRepresentsProgrammaticScroll())
     , m_fixedElementsLayoutRelativeToFrame(stateNode.fixedElementsLayoutRelativeToFrame())
     , m_asyncFrameOrOverflowScrollingEnabled(stateNode.asyncFrameOrOverflowScrollingEnabled())
@@ -332 +330 @@
     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);

trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h

@@ -146 +146 @@
 
     EventTrackingRegions m_eventTrackingRegions;
-    FloatPoint m_requestedScrollPosition;
 
     FloatRect m_layoutViewport;
@@ -158 +157 @@
     SynchronousScrollingReasons m_synchronousScrollingReasons { 0 };
     ScrollBehaviorForFixedElements m_behaviorForFixed { StickToDocumentBounds };
-    bool m_requestedScrollPositionRepresentsProgrammaticScroll { false };
     bool m_fixedElementsLayoutRelativeToFrame { false };
     bool m_asyncFrameOrOverflowScrollingEnabled { false };