Title: [243846] trunk/Source/WebCore
- Revision
- 243846
- Author
- [email protected]
- Date
- 2019-04-03 19:52:58 -0700 (Wed, 03 Apr 2019)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (243845 => 243846)
--- trunk/Source/WebCore/ChangeLog 2019-04-04 02:09:50 UTC (rev 243845)
+++ trunk/Source/WebCore/ChangeLog 2019-04-04 02:52:58 UTC (rev 243846)
@@ -1,3 +1,19 @@
+2019-04-03 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
REGRESSION (r220717): Assertion fires when animating an SVG rounded corner rect till it collapses
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp (243845 => 243846)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2019-04-04 02:09:50 UTC (rev 243845)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2019-04-04 02:52:58 UTC (rev 243846)
@@ -47,7 +47,6 @@
ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode(const ScrollingStateFrameScrollingNode& stateNode, ScrollingStateTree& adoptiveTree)
: ScrollingStateScrollingNode(stateNode, adoptiveTree)
, m_eventTrackingRegions(stateNode.eventTrackingRegions())
- , m_requestedScrollPosition(stateNode.requestedScrollPosition())
, m_layoutViewport(stateNode.layoutViewport())
, m_minLayoutViewportOrigin(stateNode.minLayoutViewportOrigin())
, m_maxLayoutViewportOrigin(stateNode.maxLayoutViewportOrigin())
@@ -57,7 +56,6 @@
, m_footerHeight(stateNode.footerHeight())
, m_synchronousScrollingReasons(stateNode.synchronousScrollingReasons())
, m_behaviorForFixed(stateNode.scrollBehaviorForFixedElements())
- , m_requestedScrollPositionRepresentsProgrammaticScroll(stateNode.requestedScrollPositionRepresentsProgrammaticScroll())
, m_fixedElementsLayoutRelativeToFrame(stateNode.fixedElementsLayoutRelativeToFrame())
, m_asyncFrameOrOverflowScrollingEnabled(stateNode.asyncFrameOrOverflowScrollingEnabled())
{
@@ -331,11 +329,6 @@
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);
}
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h (243845 => 243846)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2019-04-04 02:09:50 UTC (rev 243845)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2019-04-04 02:52:58 UTC (rev 243846)
@@ -145,7 +145,6 @@
LayerRepresentation m_footerLayer;
EventTrackingRegions m_eventTrackingRegions;
- FloatPoint m_requestedScrollPosition;
FloatRect m_layoutViewport;
FloatPoint m_minLayoutViewportOrigin;
@@ -157,7 +156,6 @@
int m_footerHeight { 0 };
SynchronousScrollingReasons m_synchronousScrollingReasons { 0 };
ScrollBehaviorForFixedElements m_behaviorForFixed { StickToDocumentBounds };
- bool m_requestedScrollPositionRepresentsProgrammaticScroll { false };
bool m_fixedElementsLayoutRelativeToFrame { false };
bool m_asyncFrameOrOverflowScrollingEnabled { false };
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
