[Reland] Remove PaintInfo's paintingRoot

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

Index: third_party/WebKit/Source/core/paint/PaintInfo.h
diff --git a/third_party/WebKit/Source/core/paint/PaintInfo.h b/third_party/WebKit/Source/core/paint/PaintInfo.h
index a424697f4a9534763f1b5d3ce7482162ce84d06a..26c95370a7a3223336d3286d99900dd007279469 100644
--- a/third_party/WebKit/Source/core/paint/PaintInfo.h
+++ b/third_party/WebKit/Source/core/paint/PaintInfo.h
@@ -51,11 +51,10 @@ class LayoutObject;
 class PaintInvalidationState;
 
 struct CORE_EXPORT PaintInfo {
-    PaintInfo(GraphicsContext& newContext, const IntRect& cullRect, PaintPhase newPhase, GlobalPaintFlags globalPaintFlags, PaintLayerFlags paintFlags,
-        LayoutObject* newPaintingRoot = nullptr, const LayoutBoxModelObject* newPaintContainer = nullptr)
+    PaintInfo(GraphicsContext& newContext, const IntRect& cullRect, PaintPhase newPhase, GlobalPaintFlags globalPaintFlags,
+        PaintLayerFlags paintFlags, const LayoutBoxModelObject* newPaintContainer = nullptr)
         : context(newContext)
         , phase(newPhase)
-        , paintingRoot(newPaintingRoot)
         , m_cullRect(cullRect)
         , m_paintContainer(newPaintContainer)
         , m_paintFlags(paintFlags)
@@ -66,7 +65,6 @@ struct CORE_EXPORT PaintInfo {
     PaintInfo(GraphicsContext& newContext, const PaintInfo& copyOtherFieldsFrom)
         : context(newContext)
         , phase(copyOtherFieldsFrom.phase)
-        , paintingRoot(copyOtherFieldsFrom.paintingRoot)
         , m_cullRect(copyOtherFieldsFrom.m_cullRect)
         , m_paintContainer(copyOtherFieldsFrom.m_paintContainer)
         , m_paintFlags(copyOtherFieldsFrom.m_paintFlags)
@@ -86,10 +84,6 @@ struct CORE_EXPORT PaintInfo {
         return result;
     }
 
-    void updatePaintingRootForChildren(const LayoutObject*);
-
-    bool shouldPaintWithinRoot(const LayoutObject*) const;
-
     bool isRenderingClipPathAsMaskImage() const { return m_paintFlags & PaintLayerPaintingRenderingClipPathAsMask; }
 
     bool skipRootBackground() const { return m_paintFlags & PaintLayerPaintingSkipRootBackground; }
@@ -112,7 +106,6 @@ struct CORE_EXPORT PaintInfo {
     // FIXME: Introduce setters/getters at some point. Requires a lot of changes throughout layout/.
     GraphicsContext& context;
     PaintPhase phase;
-    LayoutObject* paintingRoot; // used to draw just one element and its visual kids
 
 private:
     CullRect m_cullRect;