[svg2] Make 'width' and 'height' presentation attributes

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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/svg/SVGLengthContext.h"
 
 #include "core/css/CSSHelper.h"
+#include "core/css/CSSPrimitiveValue.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/style/LayoutStyle.h"
 #include "core/svg/SVGSVGElement.h"
 #include "platform/LengthFunctions.h"
 #include "platform/fonts/FontMetrics.h"
 
 namespace blink {
 
 static inline float dimensionForLengthMode(SVGLengthMode mode, const FloatSize& viewportSize)
 {
     switch (mode) {
     case SVGLengthMode::Width:
         return viewportSize.width();
     case SVGLengthMode::Height:
         return viewportSize.height();
     case SVGLengthMode::Other:
         return sqrtf(viewportSize.diagonalLengthSquared() / 2);
     }
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 static float convertValueFromPercentageToUserUnits(const SVGLength& value, const FloatSize& viewportSize)
 {
-    return value.scaleByPercentage(dimensionForLengthMode(value.unitMode(), viewportSize));
+    return CSSPrimitiveValue::clampToCSSLengthRange(value.scaleByPercentage(dimensionForLengthMode(value.unitMode(), viewportSize)));
 }
 
 SVGLengthContext::SVGLengthContext(const SVGElement* context)
     : m_context(context)
 {
 }
 
 FloatRect SVGLengthContext::resolveRectangle(const SVGElement* context, SVGUnitTypes::SVGUnitType type, const FloatRect& viewport, const SVGLength& x, const SVGLength& y, const SVGLength& width, const SVGLength& height)
 {
     ASSERT(type != SVGUnitTypes::SVG_UNIT_TYPE_UNKNOWN);
@@ skipping 66 matching lines @@
     ASSERT(zoom != 0);
     return floatValueForLength(length, dimension * zoom) / zoom;
 }
 
 float SVGLengthContext::convertValueToUserUnits(float value, SVGLengthMode mode, SVGLengthType fromUnit) const
 {
     switch (fromUnit) {
     case LengthTypeUnknown:
         return 0;
     case LengthTypeNumber:
-        return value;
+        return CSSPrimitiveValue::clampToCSSLengthRange(value);

[fs, 2015/03/12 14:28:48]

This is begging to be sunk out of the switch in one way or another. Maybe:

float userUnits = value;
switch (fromUnit) {
...
case Foo:
    userUnits *= barConstant;
    break;
...
}
// <comment about we we do this clamping operation>
return CSSPrimitiveValue::clampToCSSLengthRange(userUnits);

[Erik Dahlström (inactive), 2015/03/12 16:14:56]

Done.

     case LengthTypePX:
-        return value;
+        return CSSPrimitiveValue::clampToCSSLengthRange(value);
     case LengthTypePercentage: {
         FloatSize viewportSize;
         if (!determineViewport(viewportSize))
             return 0;
-        return value * dimensionForLengthMode(mode, viewportSize) / 100;
+        return CSSPrimitiveValue::clampToCSSLengthRange(value * dimensionForLengthMode(mode, viewportSize) / 100);
     }
     case LengthTypeEMS:
-        return convertValueFromEMSToUserUnits(value);
+        return CSSPrimitiveValue::clampToCSSLengthRange(convertValueFromEMSToUserUnits(value));
     case LengthTypeEXS:
-        return convertValueFromEXSToUserUnits(value);
+        return CSSPrimitiveValue::clampToCSSLengthRange(convertValueFromEXSToUserUnits(value));
     case LengthTypeCM:
-        return value * cssPixelsPerCentimeter;
+        return CSSPrimitiveValue::clampToCSSLengthRange(value * cssPixelsPerCentimeter);
     case LengthTypeMM:
-        return value * cssPixelsPerMillimeter;
+        return CSSPrimitiveValue::clampToCSSLengthRange(value * cssPixelsPerMillimeter);
     case LengthTypeIN:
-        return value * cssPixelsPerInch;
+        return CSSPrimitiveValue::clampToCSSLengthRange(value * cssPixelsPerInch);
     case LengthTypePT:
-        return value * cssPixelsPerPoint;
+        return CSSPrimitiveValue::clampToCSSLengthRange(value * cssPixelsPerPoint);
     case LengthTypePC:
-        return value * cssPixelsPerPica;
+        return CSSPrimitiveValue::clampToCSSLengthRange(value * cssPixelsPerPica);
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 float SVGLengthContext::convertValueFromUserUnits(float value, SVGLengthMode mode, SVGLengthType toUnit) const
 {
     switch (toUnit) {
     case LengthTypeUnknown:
@@ skipping 112 matching lines @@
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }