CL for perf tryjob

Source/core/svg/SVGLengthContext.cpp

 /*
  * Copyright (C) 2004, 2005, 2006 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 23 matching lines @@
 #include "core/svg/SVGSVGElement.h"
 #include "platform/fonts/FontMetrics.h"
 
 namespace blink {
 
 SVGLengthContext::SVGLengthContext(const SVGElement* context)
     : m_context(context)
 {
 }
 
-SVGLengthContext::SVGLengthContext(const SVGElement* context, const FloatRect& viewport)
-    : m_context(context)
-    , m_overridenViewport(viewport)
+static float valueInSpecifiedUnitsWithPercentAdjustment(const SVGLength& length)
 {
+    // 100% = 100.0 instead of 1.0 for historical reasons.
+    if (length.unitType() == LengthTypePercentage)
+        return length.valueInSpecifiedUnits() / 100;
+    return length.valueInSpecifiedUnits();
 }
 
 FloatRect SVGLengthContext::resolveRectangle(const SVGElement* context, SVGUnitTypes::SVGUnitType type, const FloatRect& viewport, PassRefPtrWillBeRawPtr<SVGLength> passX, PassRefPtrWillBeRawPtr<SVGLength> passY, PassRefPtrWillBeRawPtr<SVGLength> passWidth, PassRefPtrWillBeRawPtr<SVGLength> passHeight)
 {
     RefPtrWillBeRawPtr<SVGLength> x = passX;
     RefPtrWillBeRawPtr<SVGLength> y = passY;
     RefPtrWillBeRawPtr<SVGLength> width = passWidth;
     RefPtrWillBeRawPtr<SVGLength> height = passHeight;
 
     ASSERT(type != SVGUnitTypes::SVG_UNIT_TYPE_UNKNOWN);
-    if (type == SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE) {
-        SVGLengthContext lengthContext(context);
-        return FloatRect(x->value(lengthContext), y->value(lengthContext), width->value(lengthContext), height->value(lengthContext));
+    if (type != SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE && !viewport.isEmpty()) {
+        const FloatSize& viewportSize = viewport.size();
+        return FloatRect(
+            convertValueFromPercentageToUserUnits(valueInSpecifiedUnitsWithPercentAdjustment(*x), x->unitMode(), viewportSize) + viewport.x(),
+            convertValueFromPercentageToUserUnits(valueInSpecifiedUnitsWithPercentAdjustment(*y), y->unitMode(), viewportSize) + viewport.y(),
+            convertValueFromPercentageToUserUnits(valueInSpecifiedUnitsWithPercentAdjustment(*width), width->unitMode(), viewportSize),
+            convertValueFromPercentageToUserUnits(valueInSpecifiedUnitsWithPercentAdjustment(*height), height->unitMode(), viewportSize));
     }
 
-    SVGLengthContext lengthContext(context, viewport);
-    return FloatRect(
-        x->value(lengthContext) + viewport.x(),
-        y->value(lengthContext) + viewport.y(),
-        width->value(lengthContext),
-        height->value(lengthContext));
+    SVGLengthContext lengthContext(context);
+    return FloatRect(x->value(lengthContext), y->value(lengthContext), width->value(lengthContext), height->value(lengthContext));
 }
 
 FloatPoint SVGLengthContext::resolvePoint(const SVGElement* context, SVGUnitTypes::SVGUnitType type, PassRefPtrWillBeRawPtr<SVGLength> passX, PassRefPtrWillBeRawPtr<SVGLength> passY)
 {
     RefPtrWillBeRawPtr<SVGLength> x = passX;
     RefPtrWillBeRawPtr<SVGLength> y = passY;
 
     ASSERT(type != SVGUnitTypes::SVG_UNIT_TYPE_UNKNOWN);
     if (type == SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE) {
         SVGLengthContext lengthContext(context);
@@ skipping 13 matching lines @@
         SVGLengthContext lengthContext(context);
         return x->value(lengthContext);
     }
 
     // FIXME: valueAsPercentage() won't be correct for eg. cm units. They need to be resolved in user space and then be considered in objectBoundingBox space.
     return x->valueAsPercentage();
 }
 
 float SVGLengthContext::convertValueToUserUnits(float value, SVGLengthMode mode, SVGLengthType fromUnit, ExceptionState& exceptionState) const
 {
-    // If the SVGLengthContext carries a custom viewport, force resolving against it.
-    if (!m_overridenViewport.isEmpty()) {
-        // 100% = 100.0 instead of 1.0 for historical reasons, this could eventually be changed
-        if (fromUnit == LengthTypePercentage)
-            value /= 100;
-        return convertValueFromPercentageToUserUnits(value, mode, exceptionState);
-    }
-
     switch (fromUnit) {
     case LengthTypeUnknown:
         exceptionState.throwDOMException(NotSupportedError, ExceptionMessages::argumentNullOrIncorrectType(3, "SVGLengthType"));
         return 0;
     case LengthTypeNumber:
         return value;
     case LengthTypePX:
         return value;
     case LengthTypePercentage:
         return convertValueFromPercentageToUserUnits(value / 100, mode, exceptionState);
@@ skipping 70 matching lines @@
     return 0;
 }
 
 float SVGLengthContext::convertValueFromPercentageToUserUnits(float value, SVGLengthMode mode, ExceptionState& exceptionState) const
 {
     FloatSize viewportSize;
     if (!determineViewport(viewportSize)) {
         exceptionState.throwDOMException(NotSupportedError, "The viewport could not be determined.");
         return 0;
     }
+    return convertValueFromPercentageToUserUnits(value, mode, viewportSize);
+}
 
+float SVGLengthContext::convertValueFromPercentageToUserUnits(float value, SVGLengthMode mode, const FloatSize& viewportSize)
+{
     switch (mode) {
     case LengthModeWidth:
         return value * viewportSize.width();
     case LengthModeHeight:
         return value * viewportSize.height();
     case LengthModeOther:
         return value * sqrtf(viewportSize.diagonalLengthSquared() / 2);
     };
 
     ASSERT_NOT_REACHED();
@@ skipping 75 matching lines @@
     // Use of ceil allows a pixel match to the W3Cs expected output of coords-units-03-b.svg
     // if this causes problems in real world cases maybe it would be best to remove this
     return value * ceilf(style->fontMetrics().xHeight());
 }
 
 bool SVGLengthContext::determineViewport(FloatSize& viewportSize) const
 {
     if (!m_context)
         return false;
 
-    // If an overriden viewport is given, it has precedence.
-    if (!m_overridenViewport.isEmpty()) {
-        viewportSize = m_overridenViewport.size();
-        return true;
-    }
-
     // Root <svg> element lengths are resolved against the top level viewport.
     if (m_context->isOutermostSVGSVGElement()) {
         viewportSize = toSVGSVGElement(m_context)->currentViewportSize();
         return true;
     }
 
     // Take size from nearest viewport element.
     SVGElement* viewportElement = m_context->viewportElement();
     if (!isSVGSVGElement(viewportElement))
         return false;
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }