Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1044)

Unified Diff: Source/core/rendering/svg/RenderSVGModelObject.cpp

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/svg/RenderSVGModelObject.h ('k') | Source/core/rendering/svg/RenderSVGPath.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/svg/RenderSVGModelObject.cpp
diff --git a/Source/core/rendering/svg/RenderSVGModelObject.cpp b/Source/core/rendering/svg/RenderSVGModelObject.cpp
index d511e099118e53c827e8e9600ecf1286efadd20f..f347ac415e3fe1b4796b7ba43dd96ac9c4540a6d 100644
--- a/Source/core/rendering/svg/RenderSVGModelObject.cpp
+++ b/Source/core/rendering/svg/RenderSVGModelObject.cpp
@@ -42,11 +42,11 @@
namespace blink {
RenderSVGModelObject::RenderSVGModelObject(SVGElement* node)
- : RenderObject(node)
+ : LayoutObject(node)
{
}
-bool RenderSVGModelObject::isChildAllowed(RenderObject* child, const RenderStyle&) const
+bool RenderSVGModelObject::isChildAllowed(LayoutObject* child, const RenderStyle&) const
{
return child->isSVG() && !(child->isSVGInline() || child->isSVGInlineText());
}
@@ -61,7 +61,7 @@ void RenderSVGModelObject::mapLocalToContainer(const LayoutLayerModelObject* pai
SVGRenderSupport::mapLocalToContainer(this, paintInvalidationContainer, transformState, wasFixed, paintInvalidationState);
}
-const RenderObject* RenderSVGModelObject::pushMappingToContainer(const LayoutLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
+const LayoutObject* RenderSVGModelObject::pushMappingToContainer(const LayoutLayerModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
{
return SVGRenderSupport::pushMappingToContainer(this, ancestorToStopAt, geometryMap);
}
@@ -81,7 +81,7 @@ void RenderSVGModelObject::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixe
void RenderSVGModelObject::willBeDestroyed()
{
SVGResourcesCache::clientDestroyed(this);
- RenderObject::willBeDestroyed();
+ LayoutObject::willBeDestroyed();
}
void RenderSVGModelObject::computeLayerHitTestRects(LayerHitTestRects& rects) const
@@ -109,7 +109,7 @@ void RenderSVGModelObject::styleDidChange(StyleDifference diff, const RenderStyl
parent()->descendantIsolationRequirementsChanged(style()->hasBlendMode() ? DescendantIsolationRequired : DescendantIsolationNeedsUpdate);
}
- RenderObject::styleDidChange(diff, oldStyle);
+ LayoutObject::styleDidChange(diff, oldStyle);
SVGResourcesCache::clientStyleChanged(this, diff, style());
}
« no previous file with comments | « Source/core/rendering/svg/RenderSVGModelObject.h ('k') | Source/core/rendering/svg/RenderSVGPath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698