[svg2] Make 'rx' and 'ry' presentation attributes

Source/core/layout/svg/SVGPathData.cpp

 /*
  * 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
@@ skipping 33 matching lines @@
 
     SVGLengthContext lengthContext(element);
     float r = circle->r()->currentValue()->value(lengthContext);
     if (r > 0)
         path.addEllipse(FloatRect(circle->cx()->currentValue()->value(lengthContext) - r, circle->cy()->currentValue()->value(lengthContext) - r, r * 2, r * 2));
 }
 
 static void updatePathFromEllipseElement(SVGElement* element, Path& path)
 {
     SVGEllipseElement* ellipse = toSVGEllipseElement(element);
+    ASSERT(ellipse->renderer());
 
     SVGLengthContext lengthContext(element);
-    float rx = ellipse->rx()->currentValue()->value(lengthContext);
+    const LayoutStyle& style = ellipse->renderer()->styleRef();
+    float rx = lengthContext.valueForLength(style.svgStyle().rx(), style, LengthModeWidth);
     if (rx < 0)

[fs, 2015/02/26 14:20:58]

Shouldn't the negative value be filtered out already? With calc() considered I
suppose this could still make sense though.

[Erik Dahlström (inactive), 2015/02/26 16:16:33]

Calc may do that indeed, so I think we should keep it this way for now.

         return;
-    float ry = ellipse->ry()->currentValue()->value(lengthContext);
+    float ry = lengthContext.valueForLength(style.svgStyle().ry(), style, LengthModeHeight);
     if (ry < 0)
         return;
     if (!rx && !ry)
         return;
 
     path.addEllipse(FloatRect(ellipse->cx()->currentValue()->value(lengthContext) - rx, ellipse->cy()->currentValue()->value(lengthContext) - ry, rx * 2, ry * 2));
 }
 
 static void updatePathFromLineElement(SVGElement* element, Path& path)
 {
@@ skipping 42 matching lines @@
         return;
     float height = rect->height()->currentValue()->value(lengthContext);
     if (height < 0)
         return;
     if (!width && !height)
         return;
 
     const LayoutStyle& style = rect->renderer()->styleRef();
     float x = lengthContext.valueForLength(style.svgStyle().x(), style, LengthModeWidth);
     float y = lengthContext.valueForLength(style.svgStyle().y(), style, LengthModeHeight);
-    float rx = rect->rx()->currentValue()->value(lengthContext);
-    float ry = rect->ry()->currentValue()->value(lengthContext);
+    float rx = lengthContext.valueForLength(style.svgStyle().rx(), style, LengthModeWidth);
+    float ry = lengthContext.valueForLength(style.svgStyle().ry(), style, LengthModeHeight);
     bool hasRx = rx > 0;
     bool hasRy = ry > 0;
     if (hasRx || hasRy) {
         if (!hasRx)
             rx = ry;
         else if (!hasRy)
             ry = rx;
 
         path.addRoundedRect(FloatRect(x, y, width, height), FloatSize(rx, ry));
         return;
@@ skipping 18 matching lines @@
         map->set(polygonTag.localName().impl(), updatePathFromPolygonElement);
         map->set(polylineTag.localName().impl(), updatePathFromPolylineElement);
         map->set(rectTag.localName().impl(), updatePathFromRectElement);
     }
 
     if (PathUpdateFunction pathUpdateFunction = map->get(element->localName().impl()))
         (*pathUpdateFunction)(element, path);
 }
 
 } // namespace blink