Combine PaintPropertyTreeBuilderRootContext into PaintPropertyTreeBuilder

third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PaintPropertyTreeBuilder_h
 #define PaintPropertyTreeBuilder_h
 
 #include "platform/geometry/LayoutPoint.h"
 #include "platform/graphics/paint/ClipPaintPropertyNode.h"
 #include "platform/graphics/paint/EffectPaintPropertyNode.h"
@@ skipping 46 matching lines @@
     TransformPaintPropertyNode* transformForFixedPosition;
     LayoutPoint paintOffsetForFixedPosition;
     ClipPaintPropertyNode* clipForFixedPosition;
 
     // The effect hierarchy is applied by the stacking context tree. It is guaranteed that every
     // DOM descendant is also a stacking context descendant. Therefore, we don't need extra
     // bookkeeping for effect nodes and can generate the effect tree from a DOM-order traversal.
     EffectPaintPropertyNode* currentEffect;
 };
 
-// Holds references to root property nodes to keep them alive during tree walk.
-struct PaintPropertyTreeBuilderRootContext : public PaintPropertyTreeBuilderContext {
-    RefPtr<TransformPaintPropertyNode> transformRoot;
-    RefPtr<ClipPaintPropertyNode> clipRoot;
-    RefPtr<EffectPaintPropertyNode> effectRoot;
-};
-
 // Creates paint property tree nodes for special things in the layout tree.
 // Special things include but not limit to: overflow clip, transform, fixed-pos, animation,
 // mask, filter, ... etc.
 // It expects to be invoked for each layout tree node in DOM order during InPrePaint phase.
 class PaintPropertyTreeBuilder {
 public:
-    void buildTreeRootNodes(FrameView&, PaintPropertyTreeBuilderRootContext&);
+    void buildTreeRootNodes(FrameView&, PaintPropertyTreeBuilderContext&);
     void buildTreeNodes(FrameView&, PaintPropertyTreeBuilderContext&);
     void buildTreeNodes(const LayoutObject&, PaintPropertyTreeBuilderContext&);
 
 private:
     static void updatePaintOffsetTranslation(const LayoutObject&, PaintPropertyTreeBuilderContext&);
     static void updateTransform(const LayoutObject&, PaintPropertyTreeBuilderContext&);
     static void updateEffect(const LayoutObject&, PaintPropertyTreeBuilderContext&);
     static void updateCssClip(const LayoutObject&, PaintPropertyTreeBuilderContext&);
     static void updateLocalBorderBoxContext(const LayoutObject&, const PaintPropertyTreeBuilderContext&);
     static void updateScrollbarPaintOffset(const LayoutObject&, const PaintPropertyTreeBuilderContext&);
     static void updateOverflowClip(const LayoutObject&, PaintPropertyTreeBuilderContext&);
     static void updatePerspective(const LayoutObject&, PaintPropertyTreeBuilderContext&);
     static void updateSvgLocalTransform(const LayoutObject&, PaintPropertyTreeBuilderContext&);
     static void updateScrollTranslation(const LayoutObject&, PaintPropertyTreeBuilderContext&);
     static void updateOutOfFlowContext(const LayoutObject&, PaintPropertyTreeBuilderContext&);
+
+    // Holds references to root property nodes to keep them alive during tree walk.
+    RefPtr<TransformPaintPropertyNode> transformRoot;
+    RefPtr<ClipPaintPropertyNode> clipRoot;
+    RefPtr<EffectPaintPropertyNode> effectRoot;
 };
 
 } // namespace blink
 
 #endif // PaintPropertyTreeBuilder_h