Move scroll paint property nodes to be owned by the transform tree

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

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
    reserved.
 
    This library is free software; you can redistribute it and/or
@@ skipping 696 matching lines @@
   }
 
   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(); }
 
   // The property tree state that should be used for painting contents. These
   // properties are either created by this FrameView or are inherited from
   // an ancestor.
   void setTotalPropertyTreeStateForContents(
       std::unique_ptr<PropertyTreeState> state) {
@@ skipping 412 matching lines @@
 
   // Paint properties for SPv2 Only.
   // The hierarchy of transform subtree created by a FrameView.
   // [ preTranslation ]               The offset from Widget::frameRect.
   //     |                            Establishes viewport.
   //     +---[ scrollTranslation ]    Frame scrolling.
   // 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;
   // The property tree state that should be used for painting contents. These
   // properties are either created by this FrameView or are inherited from
   // an ancestor.
   std::unique_ptr<PropertyTreeState> m_totalPropertyTreeStateForContents;
   // Whether the paint properties need to be updated. For more details, see
   // FrameView::needsPaintPropertyUpdate().
@@ skipping 76 matching lines @@
                   widget.isFrameView());
 DEFINE_TYPE_CASTS(FrameView,
                   ScrollableArea,
                   scrollableArea,
                   scrollableArea->isFrameView(),
                   scrollableArea.isFrameView());
 
 }  // namespace blink
 
 #endif  // FrameView_h