[SPV2] Implement the blink-side scroll property tree

third_party/WebKit/Source/core/frame/FrameView.h

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 62d8defcdf6fd3d991dca25df241567051ff4e2e..464953ad0d065036ef9cc5aaa9a588a63fabdee8 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"
@@ -600,17 +601,22 @@ 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(); }
 
+    // We store no-op paint property tree nodes at the root of the tree.
+    // TODO(pdr): Remove this concept in favor of null nodes, see: crbug.com/645615
     void setRootTransform(PassRefPtr<TransformPaintPropertyNode> rootTransform) { m_rootTransform = rootTransform; }
     TransformPaintPropertyNode* rootTransform() const { return m_rootTransform.get(); }
-
     void setRootClip(PassRefPtr<ClipPaintPropertyNode> rootClip) { m_rootClip = rootClip; }
     ClipPaintPropertyNode* rootClip() const { return m_rootClip.get(); }
-
     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();
@@ -918,6 +924,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;
@@ -927,6 +934,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;