| Index: Source/core/rendering/svg/RenderSVGRoot.cpp
|
| diff --git a/Source/core/rendering/svg/RenderSVGRoot.cpp b/Source/core/rendering/svg/RenderSVGRoot.cpp
|
| index 84c1de452588065950406a27fc8e3a98ba94123e..631a94bb8ade0f89db28f582f5206eb92447837b 100644
|
| --- a/Source/core/rendering/svg/RenderSVGRoot.cpp
|
| +++ b/Source/core/rendering/svg/RenderSVGRoot.cpp
|
| @@ -27,8 +27,8 @@
|
|
|
| #include "core/frame/LocalFrame.h"
|
| #include "core/layout/HitTestResult.h"
|
| +#include "core/layout/Layer.h"
|
| #include "core/paint/SVGRootPainter.h"
|
| -#include "core/rendering/RenderLayer.h"
|
| #include "core/rendering/RenderPart.h"
|
| #include "core/rendering/RenderView.h"
|
| #include "core/rendering/svg/SVGRenderSupport.h"
|
| @@ -320,7 +320,7 @@ const AffineTransform& RenderSVGRoot::localToParentTransform() const
|
| return m_localToParentTransform;
|
| }
|
|
|
| -LayoutRect RenderSVGRoot::clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
|
| +LayoutRect RenderSVGRoot::clippedOverflowRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
|
| {
|
| // This is an open-coded aggregate of SVGRenderSupport::clippedOverflowRectForPaintInvalidation,
|
| // RenderSVGRoot::mapRectToPaintInvalidationBacking and RenderReplaced::clippedOverflowRectForPaintInvalidation.
|
| @@ -354,7 +354,7 @@ LayoutRect RenderSVGRoot::clippedOverflowRectForPaintInvalidation(const RenderLa
|
| return rect;
|
| }
|
|
|
| -void RenderSVGRoot::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const
|
| +void RenderSVGRoot::mapRectToPaintInvalidationBacking(const LayoutLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const
|
| {
|
| // Note that we don't apply the border-box transform here - it's assumed
|
| // that whoever called us has done that already.
|
| @@ -369,7 +369,7 @@ void RenderSVGRoot::mapRectToPaintInvalidationBacking(const RenderLayerModelObje
|
| // This method expects local CSS box coordinates.
|
| // Callers with local SVG viewport coordinates should first apply the localToBorderBoxTransform
|
| // to convert from SVG viewport coordinates to local CSS box coordinates.
|
| -void RenderSVGRoot::mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const
|
| +void RenderSVGRoot::mapLocalToContainer(const LayoutLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const
|
| {
|
| ASSERT(mode & ~IsFixed); // We should have no fixed content in the SVG rendering tree.
|
| // We used to have this ASSERT here, but we removed it when enabling layer squashing.
|
| @@ -379,7 +379,7 @@ void RenderSVGRoot::mapLocalToContainer(const RenderLayerModelObject* paintInval
|
| RenderReplaced::mapLocalToContainer(paintInvalidationContainer, transformState, mode | ApplyContainerFlip, wasFixed, paintInvalidationState);
|
| }
|
|
|
| -const RenderObject* RenderSVGRoot::pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
|
| +const RenderObject* RenderSVGRoot::pushMappingToContainer(const LayoutLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
|
| {
|
| return RenderReplaced::pushMappingToContainer(ancestorToStopAt, geometryMap);
|
| }
|
|
|