From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- .../WebCore/page/scrolling/ScrollingStateFixedNode.h | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'Source/WebCore/page/scrolling/ScrollingStateFixedNode.h') diff --git a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h index a52d7b6d0..e761b6a73 100644 --- a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h +++ b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h @@ -23,8 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef ScrollingStateFixedNode_h -#define ScrollingStateFixedNode_h +#pragma once #if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS) @@ -39,9 +38,9 @@ class FixedPositionViewportConstraints; class ScrollingStateFixedNode final : public ScrollingStateNode { public: - static PassOwnPtr create(ScrollingStateTree&, ScrollingNodeID); + static Ref create(ScrollingStateTree&, ScrollingNodeID); - virtual PassOwnPtr clone(ScrollingStateTree&); + Ref clone(ScrollingStateTree&) override; virtual ~ScrollingStateFixedNode(); @@ -49,24 +48,22 @@ public: ViewportConstraints = NumStateNodeBits }; - void updateConstraints(const FixedPositionViewportConstraints&); + WEBCORE_EXPORT void updateConstraints(const FixedPositionViewportConstraints&); const FixedPositionViewportConstraints& viewportConstraints() const { return m_constraints; } private: ScrollingStateFixedNode(ScrollingStateTree&, ScrollingNodeID); ScrollingStateFixedNode(const ScrollingStateFixedNode&, ScrollingStateTree&); - virtual void syncLayerPositionForViewportRect(const LayoutRect& viewportRect) override; + void reconcileLayerPositionForViewportRect(const LayoutRect& viewportRect, ScrollingLayerPositionAction) override; - virtual void dumpProperties(TextStream&, int indent) const override; + void dumpProperties(TextStream&, int indent, ScrollingStateTreeAsTextBehavior) const override; FixedPositionViewportConstraints m_constraints; }; -SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateFixedNode, nodeType() == FixedNode); - } // namespace WebCore -#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS) +SPECIALIZE_TYPE_TRAITS_SCROLLING_STATE_NODE(ScrollingStateFixedNode, isFixedNode()) -#endif // ScrollingStateFixedNode_h +#endif // ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS) -- cgit v1.2.1