Combine PaintPropertyTreeBuilderRootContext into PaintPropertyTreeBuilder

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

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h
index 8a98f24b606ed16e788e0c1a80cc5ba4be6a79af..8c500f927727ec6969496a7dea1eb857e2c97e22 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.h
@@ -64,20 +64,13 @@ struct PaintPropertyTreeBuilderContext {
     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&);
 
@@ -93,6 +86,11 @@ private:
     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