[svg2] Make 'cx', 'cy' and 'r' 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 22 matching lines @@
 #include "core/svg/SVGRectElement.h"
 #include "platform/graphics/Path.h"
 #include "wtf/HashMap.h"
 
 namespace blink {
 
 using namespace SVGNames;
 
 static void updatePathFromCircleElement(SVGElement* element, Path& path)
 {
-    SVGCircleElement* circle = toSVGCircleElement(element);
+    ASSERT(element->layoutObject());
 
     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));
+    const LayoutStyle& style = element->layoutObject()->styleRef();
+    float r = lengthContext.valueForLength(style.svgStyle().r(), style, SVGLengthMode::Other);
+    if (r > 0) {
+        path.addEllipse(FloatRect(
+            lengthContext.valueForLength(style.svgStyle().cx(), style, SVGLengthMode::Width) - r,
+            lengthContext.valueForLength(style.svgStyle().cy(), style, SVGLengthMode::Height) - r,
+            r * 2, r * 2));
+    }
 }
 
 static void updatePathFromEllipseElement(SVGElement* element, Path& path)
 {
-    SVGEllipseElement* ellipse = toSVGEllipseElement(element);
-    ASSERT(ellipse->layoutObject());
+    ASSERT(element->layoutObject());
 
     SVGLengthContext lengthContext(element);
-    const LayoutStyle& style = ellipse->layoutObject()->styleRef();
+    const LayoutStyle& style = element->layoutObject()->styleRef();
     float rx = lengthContext.valueForLength(style.svgStyle().rx(), style, SVGLengthMode::Width);
     if (rx < 0)
         return;
     float ry = lengthContext.valueForLength(style.svgStyle().ry(), style, SVGLengthMode::Height);
     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));
+    path.addEllipse(FloatRect(
+        lengthContext.valueForLength(style.svgStyle().cx(), style, SVGLengthMode::Width) - rx,
+        lengthContext.valueForLength(style.svgStyle().cy(), style, SVGLengthMode::Height) - ry,
+        rx * 2, ry * 2));
 }
 
 static void updatePathFromLineElement(SVGElement* element, Path& path)
 {
     SVGLineElement* line = toSVGLineElement(element);
 
     SVGLengthContext lengthContext(element);
     path.moveTo(FloatPoint(line->x1()->currentValue()->value(lengthContext), line->y1()->currentValue()->value(lengthContext)));
     path.addLineTo(FloatPoint(line->x2()->currentValue()->value(lengthContext), line->y2()->currentValue()->value(lengthContext)));
 }
@@ skipping 76 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