From e458d70a0d18538346f41b503114c9ebe6b2ce12 Mon Sep 17 00:00:00 2001 From: Leon Clarke Date: Thu, 15 Jul 2010 12:03:35 +0100 Subject: Merge WebKit at r63173 : Initial merge by git. Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44 --- WebCore/rendering/RenderSVGViewportContainer.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'WebCore/rendering/RenderSVGViewportContainer.cpp') diff --git a/WebCore/rendering/RenderSVGViewportContainer.cpp b/WebCore/rendering/RenderSVGViewportContainer.cpp index ca735d2..f314bde 100644 --- a/WebCore/rendering/RenderSVGViewportContainer.cpp +++ b/WebCore/rendering/RenderSVGViewportContainer.cpp @@ -45,18 +45,13 @@ void RenderSVGViewportContainer::applyViewportClip(PaintInfo& paintInfo) void RenderSVGViewportContainer::calcViewport() { - SVGElement* svgelem = static_cast(node()); - if (svgelem->hasTagName(SVGNames::svgTag)) { - SVGSVGElement* svg = static_cast(node()); - - if (!selfNeedsLayout() && !svg->hasRelativeLengths()) - return; - - float x = svg->x().value(svg); - float y = svg->y().value(svg); - float w = svg->width().value(svg); - float h = svg->height().value(svg); - m_viewport = FloatRect(x, y, w, h); + SVGElement* element = static_cast(node()); + if (element->hasTagName(SVGNames::svgTag)) { + SVGSVGElement* svg = static_cast(element); + m_viewport = FloatRect(svg->x().value(svg) + , svg->y().value(svg) + , svg->width().value(svg) + , svg->height().value(svg)); } } -- cgit v1.1