Index: third_party/WebKit/Source/core/frame/FrameView.h |
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h |
index 55f071cafc334489d06d45c50113a5303dd18096..b171e8514602ba36e9bc30566a937eb7977a5813 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.h |
+++ b/third_party/WebKit/Source/core/frame/FrameView.h |
@@ -42,6 +42,7 @@ |
#include "platform/graphics/Color.h" |
#include "platform/graphics/paint/ClipPaintPropertyNode.h" |
#include "platform/graphics/paint/EffectPaintPropertyNode.h" |
+#include "platform/graphics/paint/ScrollPaintPropertyNode.h" |
#include "platform/graphics/paint/TransformPaintPropertyNode.h" |
#include "platform/scroll/ScrollTypes.h" |
#include "platform/scroll/Scrollbar.h" |
@@ -602,6 +603,9 @@ public: |
void setScrollTranslation(PassRefPtr<TransformPaintPropertyNode> scrollTranslation) { m_scrollTranslation = scrollTranslation; } |
TransformPaintPropertyNode* scrollTranslation() const { return m_scrollTranslation.get(); } |
+ void setScroll(PassRefPtr<ScrollPaintPropertyNode> scroll) { m_scroll = scroll; } |
+ ScrollPaintPropertyNode* scroll() const { return m_scroll.get(); } |
+ |
void setContentClip(PassRefPtr<ClipPaintPropertyNode> contentClip) { m_contentClip = contentClip; } |
ClipPaintPropertyNode* contentClip() const { return m_contentClip.get(); } |
@@ -614,6 +618,9 @@ public: |
void setRootEffect(PassRefPtr<EffectPaintPropertyNode> rootEffect) { m_rootEffect = rootEffect; } |
EffectPaintPropertyNode* rootEffect() const { return m_rootEffect.get(); } |
+ void setRootScroll(PassRefPtr<ScrollPaintPropertyNode> rootScroll) { m_rootScroll = rootScroll; } |
+ ScrollPaintPropertyNode* rootScroll() const { return m_rootScroll.get(); } |
+ |
// TODO(ojan): Merge this with IntersectionObserver once it lands. |
IntRect computeVisibleArea(); |
@@ -920,6 +927,7 @@ private: |
// TODO(trchen): These will not be needed once settings->rootLayerScrolls() is enabled. |
RefPtr<TransformPaintPropertyNode> m_preTranslation; |
RefPtr<TransformPaintPropertyNode> m_scrollTranslation; |
+ RefPtr<ScrollPaintPropertyNode> m_scroll; |
// The content clip clips the document (= LayoutView) but not the scrollbars. |
// TODO(trchen): This will not be needed once settings->rootLayerScrolls() is enabled. |
RefPtr<ClipPaintPropertyNode> m_contentClip; |
@@ -929,6 +937,7 @@ private: |
RefPtr<TransformPaintPropertyNode> m_rootTransform; |
RefPtr<ClipPaintPropertyNode> m_rootClip; |
RefPtr<EffectPaintPropertyNode> m_rootEffect; |
+ RefPtr<ScrollPaintPropertyNode> m_rootScroll; |
// This is set on the local root frame view only. |
DocumentLifecycle::LifecycleState m_currentUpdateLifecyclePhasesTargetState; |