[svg2] Make 'cx', 'cy' and 'r' presentation attributes

Source/core/layout/svg/LayoutSVGEllipse.cpp

 /*
  * Copyright (C) 2012 Google, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 64 matching lines @@
 
     m_fillBoundingBox = FloatRect(m_center.x() - m_radii.width(), m_center.y() - m_radii.height(), 2 * m_radii.width(), 2 * m_radii.height());
     m_strokeBoundingBox = m_fillBoundingBox;
     if (style()->svgStyle().hasStroke())
         m_strokeBoundingBox.inflate(strokeWidth() / 2);
 }
 
 void LayoutSVGEllipse::calculateRadiiAndCenter()
 {
     ASSERT(element());
+    SVGLengthContext lengthContext(element());
+    m_center = FloatPoint(
+        lengthContext.valueForLength(style()->svgStyle().cx(), styleRef(), SVGLengthMode::Width),
+        lengthContext.valueForLength(style()->svgStyle().cy(), styleRef(), SVGLengthMode::Height));
+
     if (isSVGCircleElement(*element())) {
-        SVGCircleElement& circle = toSVGCircleElement(*element());
-
-        SVGLengthContext lengthContext(&circle);
-        float radius = circle.r()->currentValue()->value(lengthContext);
+        float radius = lengthContext.valueForLength(style()->svgStyle().r(), styleRef(), SVGLengthMode::Other);
         m_radii = FloatSize(radius, radius);
-        m_center = FloatPoint(circle.cx()->currentValue()->value(lengthContext), circle.cy()->currentValue()->value(lengthContext));
-        return;
+    } else {
+        m_radii = FloatSize(
+            lengthContext.valueForLength(style()->svgStyle().rx(), styleRef(), SVGLengthMode::Width),
+            lengthContext.valueForLength(style()->svgStyle().ry(), styleRef(), SVGLengthMode::Height));
     }
-
-    SVGEllipseElement& ellipse = toSVGEllipseElement(*element());
-
-    SVGLengthContext lengthContext(&ellipse);
-    m_radii = FloatSize(ellipse.rx()->currentValue()->value(lengthContext), ellipse.ry()->currentValue()->value(lengthContext));
-    m_center = FloatPoint(ellipse.cx()->currentValue()->value(lengthContext), ellipse.cy()->currentValue()->value(lengthContext));
 }
 
 bool LayoutSVGEllipse::shapeDependentStrokeContains(const FloatPoint& point)
 {
     // The optimized check below for circles does not support non-scaling or
     // discontinuous strokes.
     if (m_usePathFallback
         || !hasContinuousStroke()
         || m_radii.width() != m_radii.height()) {
         if (!hasPath())
@@ skipping 18 matching lines @@
     return xrX * xrX + yrY * yrY <= 1.0;
 }
 
 bool LayoutSVGEllipse::hasContinuousStroke() const
 {
     const SVGLayoutStyle& svgStyle = style()->svgStyle();
     return svgStyle.strokeDashArray()->isEmpty();
 }
 
 }