From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 13:02:20 +0100 Subject: Merge WebKit at r70209: Initial merge by Git Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e --- WebCore/rendering/SVGRenderSupport.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'WebCore/rendering/SVGRenderSupport.cpp') diff --git a/WebCore/rendering/SVGRenderSupport.cpp b/WebCore/rendering/SVGRenderSupport.cpp index 644ff70..608cf4d 100644 --- a/WebCore/rendering/SVGRenderSupport.cpp +++ b/WebCore/rendering/SVGRenderSupport.cpp @@ -32,7 +32,7 @@ #include "ImageBuffer.h" #include "NodeRenderStyle.h" #include "RenderLayer.h" -#include "RenderPath.h" +#include "RenderSVGPath.h" #include "RenderSVGResource.h" #include "RenderSVGResourceClipper.h" #include "RenderSVGResourceFilter.h" @@ -220,9 +220,9 @@ void SVGRenderSupport::layoutChildren(RenderObject* start, bool selfNeedsLayout) // When selfNeedsLayout is false and the layout size changed, we have to check whether this child uses relative lengths if (SVGElement* element = child->node()->isSVGElement() ? static_cast(child->node()) : 0) { if (element->isStyled() && static_cast(element)->hasRelativeLengths()) { - // When the layout size changed and when using relative values tell the RenderPath to update its Path object - if (child->isRenderPath()) - toRenderPath(child)->setNeedsPathUpdate(); + // When the layout size changed and when using relative values tell the RenderSVGPath to update its Path object + if (child->isSVGPath()) + toRenderSVGPath(child)->setNeedsPathUpdate(); needsLayout = true; } @@ -347,16 +347,6 @@ void SVGRenderSupport::applyStrokeStyleToContext(GraphicsContext* context, const } } -const RenderObject* SVGRenderSupport::findTextRootObject(const RenderObject* start) -{ - while (start && !start->isSVGText()) - start = start->parent(); - ASSERT(start); - ASSERT(start->isSVGText()); - - return start; -} - } #endif -- cgit v1.1