Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/PaintInvalidationState.h

Index: Source/core/layout/PaintInvalidationState.h
diff --git a/Source/core/layout/PaintInvalidationState.h b/Source/core/layout/PaintInvalidationState.h
index d768032c2b6389050e8ce66139c5abc7ac20daf3..a127d6c63e209bfb17c9f844d35926e8891a224a 100644
--- a/Source/core/layout/PaintInvalidationState.h
+++ b/Source/core/layout/PaintInvalidationState.h
@@ -11,7 +11,7 @@
 
 namespace blink {
 
-class LayoutLayerModelObject;
+class LayoutBoxModelObject;
 class LayoutObject;
 class LayoutSVGModelObject;
 class RenderView;
@@ -19,7 +19,7 @@ class RenderView;
 class PaintInvalidationState {
     WTF_MAKE_NONCOPYABLE(PaintInvalidationState);
 public:
-    PaintInvalidationState(const PaintInvalidationState& next, LayoutLayerModelObject& renderer, const LayoutLayerModelObject& paintInvalidationContainer);
+    PaintInvalidationState(const PaintInvalidationState& next, LayoutBoxModelObject& renderer, const LayoutBoxModelObject& paintInvalidationContainer);
     PaintInvalidationState(const PaintInvalidationState& next, const LayoutSVGModelObject& renderer);
 
     explicit PaintInvalidationState(const RenderView&);
@@ -34,9 +34,9 @@ public:
     bool forceCheckForPaintInvalidation() const { return m_forceCheckForPaintInvalidation; }
     void setForceCheckForPaintInvalidation() { m_forceCheckForPaintInvalidation = true; }
 
-    const LayoutLayerModelObject& paintInvalidationContainer() const { return m_paintInvalidationContainer; }
+    const LayoutBoxModelObject& paintInvalidationContainer() const { return m_paintInvalidationContainer; }
 
-    bool canMapToContainer(const LayoutLayerModelObject* container) const
+    bool canMapToContainer(const LayoutBoxModelObject* container) const
     {
         return m_cachedOffsetsEnabled && container == &m_paintInvalidationContainer;
     }
@@ -55,7 +55,7 @@ private:
     // x/y offset from paint invalidation container. Includes relative positioning and scroll offsets.
     LayoutSize m_paintOffset;
 
-    const LayoutLayerModelObject& m_paintInvalidationContainer;
+    const LayoutBoxModelObject& m_paintInvalidationContainer;
 
     // Transform from the initial viewport coordinate system of an outermost
     // SVG root to the userspace _before_ the relevant element. Combining this