Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/PaintInvalidationState.cpp

 // Copyright 2014 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.
 
 #include "config.h"
 #include "core/layout/PaintInvalidationState.h"
 
 #include "core/layout/Layer.h"
 #include "core/layout/svg/LayoutSVGModelObject.h"
 #include "core/layout/svg/LayoutSVGRoot.h"
@@ skipping 16 matching lines @@
             return;
         }
         FloatPoint point = renderView.localToContainerPoint(FloatPoint(), &m_paintInvalidationContainer, TraverseDocumentBoundaries);
         m_paintOffset = LayoutSize(point.x(), point.y());
     }
     m_clipRect = renderView.viewRect();
     m_clipRect.move(m_paintOffset);
     m_clipped = true;
 }
 
-PaintInvalidationState::PaintInvalidationState(const PaintInvalidationState& next, LayoutLayerModelObject& renderer, const LayoutLayerModelObject& paintInvalidationContainer)
+PaintInvalidationState::PaintInvalidationState(const PaintInvalidationState& next, RenderBoxModelObject& renderer, const RenderBoxModelObject& paintInvalidationContainer)
     : m_clipped(false)
     , m_cachedOffsetsEnabled(true)
     , m_forceCheckForPaintInvalidation(next.m_forceCheckForPaintInvalidation)
     , m_paintInvalidationContainer(paintInvalidationContainer)
 {
     // FIXME: SVG could probably benefit from a stack-based optimization like html does. crbug.com/391054
     bool establishesPaintInvalidationContainer = renderer == m_paintInvalidationContainer;
     bool fixed = renderer.style()->position() == FixedPosition;
 
     if (!renderer.supportsPaintInvalidationStateCachedOffsets() || !next.m_cachedOffsetsEnabled)
@@ skipping 77 matching lines @@
     // to be always invalidated in-time.
     if (box.usesCompositedScrolling())
         ASSERT(!m_clipped); // The box should establish paint invalidation container, so no m_clipped inherited.
     else
         addClipRectRelativeToPaintOffset(LayoutSize(box.layer()->size()));
 
     m_paintOffset -= box.scrolledContentOffset();
 }
 
 } // namespace blink