Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/web/LinkHighlight.cpp

Index: Source/web/LinkHighlight.cpp
diff --git a/Source/web/LinkHighlight.cpp b/Source/web/LinkHighlight.cpp
index ca822637c52807c7be71039cb3537ee9e16ee911..bf15fe33b7e9368a377f0324db599a1b5edfa906 100644
--- a/Source/web/LinkHighlight.cpp
+++ b/Source/web/LinkHighlight.cpp
@@ -33,10 +33,10 @@
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/layout/Layer.h"
-#include "core/layout/LayoutLayerModelObject.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/style/ShadowData.h"
+#include "core/rendering/RenderBoxModelObject.h"
 #include "core/rendering/RenderView.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/paint/DisplayItemList.h"
@@ -106,7 +106,7 @@ void LinkHighlight::releaseResources()
     m_node.clear();
 }
 
-void LinkHighlight::attachLinkHighlightToCompositingLayer(const LayoutLayerModelObject* paintInvalidationContainer)
+void LinkHighlight::attachLinkHighlightToCompositingLayer(const RenderBoxModelObject* paintInvalidationContainer)
 {
     GraphicsLayer* newGraphicsLayer = paintInvalidationContainer->layer()->graphicsLayerBacking();
     // FIXME: There should always be a GraphicsLayer. See crbug.com/431961.
@@ -126,7 +126,7 @@ void LinkHighlight::attachLinkHighlightToCompositingLayer(const LayoutLayerModel
     }
 }
 
-static void convertTargetSpaceQuadToCompositedLayer(const FloatQuad& targetSpaceQuad, LayoutObject* targetRenderer, const LayoutLayerModelObject* paintInvalidationContainer, FloatQuad& compositedSpaceQuad)
+static void convertTargetSpaceQuadToCompositedLayer(const FloatQuad& targetSpaceQuad, LayoutObject* targetRenderer, const RenderBoxModelObject* paintInvalidationContainer, FloatQuad& compositedSpaceQuad)
 {
     ASSERT(targetRenderer);
     ASSERT(paintInvalidationContainer);
@@ -185,7 +185,7 @@ void LinkHighlight::computeQuads(const Node& node, Vector<FloatQuad>& outQuads)
     }
 }
 
-bool LinkHighlight::computeHighlightLayerPathAndPosition(const LayoutLayerModelObject* paintInvalidationContainer)
+bool LinkHighlight::computeHighlightLayerPathAndPosition(const RenderBoxModelObject* paintInvalidationContainer)
 {
     if (!m_node || !m_node->renderer() || !m_currentGraphicsLayer)
         return false;
@@ -340,7 +340,7 @@ void LinkHighlight::updateGeometry()
     m_geometryNeedsUpdate = false;
 
     bool hasRenderer = m_node && m_node->renderer();
-    const LayoutLayerModelObject* paintInvalidationContainer = hasRenderer ? m_node->renderer()->containerForPaintInvalidation() : 0;
+    const RenderBoxModelObject* paintInvalidationContainer = hasRenderer ? m_node->renderer()->containerForPaintInvalidation() : 0;
     if (paintInvalidationContainer)
         attachLinkHighlightToCompositingLayer(paintInvalidationContainer);
     if (paintInvalidationContainer && computeHighlightLayerPathAndPosition(paintInvalidationContainer)) {