[svg2] Make 'x' and 'y' 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.
@@ skipping 14 matching lines @@
 
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/SVGNames.h"
 #include "core/css/CSSHelper.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/svg/RenderSVGRoot.h"
 #include "core/rendering/svg/RenderSVGViewportContainer.h"
 #include "core/svg/SVGSVGElement.h"
+#include "platform/LengthFunctions.h"
 #include "platform/fonts/FontMetrics.h"
 
 namespace blink {
 
 SVGLengthContext::SVGLengthContext(const SVGElement* context)
     : m_context(context)
 {
 }
 
 FloatRect SVGLengthContext::resolveRectangle(const SVGElement* context, SVGUnitTypes::SVGUnitType type, const FloatRect& viewport, PassRefPtrWillBeRawPtr<SVGLength> passX, PassRefPtrWillBeRawPtr<SVGLength> passY, PassRefPtrWillBeRawPtr<SVGLength> passWidth, PassRefPtrWillBeRawPtr<SVGLength> passHeight)
@@ skipping 39 matching lines @@
     ASSERT(type != SVGUnitTypes::SVG_UNIT_TYPE_UNKNOWN);
     if (type == SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE) {
         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::valueForLength(const Length& length, SVGLengthMode mode)
+{
+    if (length.isPercent())
+        return convertValueFromPercentageToUserUnits(length.value() / 100, mode, IGNORE_EXCEPTION);

[fs, 2015/02/04 13:24:53]

Move this after the 'auto' check, and then use the version of
convertValueFromPercentageToUserUnits that doesn't take an ExceptionState (but a
viewport-size).

[fs, 2015/02/04 13:24:53]

I'm sure bratell would want you to do the division last ;-)

[Erik Dahlström (inactive), 2015/02/05 16:09:02]

Done.

[Erik Dahlström (inactive), 2015/02/05 16:09:02]

Done.

+    if (length.isAuto())
+        return 0;
+
+    FloatSize viewportSize;
+    determineViewport(viewportSize);
+
+    switch (mode) {
+    case LengthModeWidth:

[fs, 2015/02/04 13:24:53]

(Given the amount of these switches this file/class now has, I wonder if it
wouldn't be nicer to factor these as:

static float factorForLengthMode(SVGLengthMode mode, const FloatSize&
viewportSize)
{
    switch (mode) {
    case LengthModeWidth:
        return viewportSize.width();
...
    }
}

...
return floatValueForLength(length, factorForLengthMode(...));

I'll see if I can whip something up for that...)

[Erik Dahlström (inactive), 2015/02/05 16:09:02]

Acknowledged.

+        return floatValueForLength(length, viewportSize.width());
+    case LengthModeHeight:
+        return floatValueForLength(length, viewportSize.height());
+    case LengthModeOther:
+        return floatValueForLength(length, sqrtf(viewportSize.diagonalLengthSquared() / 2));
+    };
+    return 0;
+}
+
 float SVGLengthContext::convertValueToUserUnits(float value, SVGLengthMode mode, SVGLengthType fromUnit, ExceptionState& exceptionState) const
 {
     switch (fromUnit) {
     case LengthTypeUnknown:
         exceptionState.throwDOMException(NotSupportedError, ExceptionMessages::argumentNullOrIncorrectType(3, "SVGLengthType"));
         return 0;
     case LengthTypeNumber:
         return value;
     case LengthTypePX:
         return value;
@@ skipping 207 matching lines @@
 
     const SVGSVGElement& svg = toSVGSVGElement(*viewportElement);
     viewportSize = svg.currentViewBoxRect().size();
     if (viewportSize.isEmpty())
         viewportSize = svg.currentViewportSize();
 
     return true;
 }
 
 }