Index: Source/core/rendering/RenderInline.cpp |
diff --git a/Source/core/rendering/RenderInline.cpp b/Source/core/rendering/RenderInline.cpp |
index cb11acf12e22c05d82214a8817c265db7b1b3ab9..a9b36e0d425ad7b2f01c1b5d6de2cb15a15fe4bd 100644 |
--- a/Source/core/rendering/RenderInline.cpp |
+++ b/Source/core/rendering/RenderInline.cpp |
@@ -26,6 +26,7 @@ |
#include "core/dom/Fullscreen.h" |
#include "core/dom/StyleEngine.h" |
#include "core/layout/HitTestResult.h" |
+#include "core/layout/Layer.h" |
#include "core/layout/LayoutTheme.h" |
#include "core/page/Chrome.h" |
#include "core/page/Page.h" |
@@ -37,7 +38,6 @@ |
#include "core/rendering/RenderFlowThread.h" |
#include "core/rendering/RenderFullScreen.h" |
#include "core/rendering/RenderGeometryMap.h" |
-#include "core/rendering/RenderLayer.h" |
#include "core/rendering/RenderView.h" |
#include "core/rendering/style/StyleInheritedData.h" |
#include "platform/geometry/FloatQuad.h" |
@@ -1049,7 +1049,7 @@ LayoutRect RenderInline::absoluteClippedOverflowRect() const |
return LayoutRect(); |
} |
-LayoutRect RenderInline::clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const |
+LayoutRect RenderInline::clippedOverflowRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const |
{ |
// If we don't create line boxes, we don't have any invalidations to do. |
if (!alwaysCreateLineBoxes()) |
@@ -1057,7 +1057,7 @@ LayoutRect RenderInline::clippedOverflowRectForPaintInvalidation(const RenderLay |
return clippedOverflowRect(paintInvalidationContainer); |
} |
-LayoutRect RenderInline::clippedOverflowRect(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const |
+LayoutRect RenderInline::clippedOverflowRect(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const |
{ |
if ((!firstLineBoxIncludingCulling() && !continuation()) || style()->visibility() != VISIBLE) |
return LayoutRect(); |
@@ -1082,7 +1082,7 @@ LayoutRect RenderInline::clippedOverflowRect(const RenderLayerModelObject* paint |
return overflowRect; |
} |
-LayoutRect RenderInline::rectWithOutlineForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalidationState* paintInvalidationState) const |
+LayoutRect RenderInline::rectWithOutlineForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalidationState* paintInvalidationState) const |
{ |
LayoutRect r(RenderBoxModelObject::rectWithOutlineForPaintInvalidation(paintInvalidationContainer, outlineWidth, paintInvalidationState)); |
for (RenderObject* curr = firstChild(); curr; curr = curr->nextSibling()) { |
@@ -1092,7 +1092,7 @@ LayoutRect RenderInline::rectWithOutlineForPaintInvalidation(const RenderLayerMo |
return r; |
} |
-void RenderInline::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const |
+void RenderInline::mapRectToPaintInvalidationBacking(const LayoutLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const |
{ |
if (paintInvalidationState && paintInvalidationState->canMapToContainer(paintInvalidationContainer)) { |
if (style()->hasInFlowPosition() && layer()) |
@@ -1173,7 +1173,7 @@ LayoutSize RenderInline::offsetFromContainer(const RenderObject* container, cons |
return offset; |
} |
-void RenderInline::mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const |
+void RenderInline::mapLocalToContainer(const LayoutLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const |
{ |
if (paintInvalidationContainer == this) |
return; |