[svg2] Make 'x' and 'y' 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
  * 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/layout/svg/SVGPathData.h"
 
 #include "core/SVGNames.h"
+#include "core/layout/LayoutObject.h"
+#include "core/layout/style/SVGLayoutStyle.h"
 #include "core/svg/SVGCircleElement.h"
 #include "core/svg/SVGEllipseElement.h"
 #include "core/svg/SVGLineElement.h"
 #include "core/svg/SVGPathElement.h"
 #include "core/svg/SVGPathUtilities.h"
 #include "core/svg/SVGPolygonElement.h"
 #include "core/svg/SVGPolylineElement.h"
 #include "core/svg/SVGRectElement.h"
 #include "platform/graphics/Path.h"
 #include "wtf/HashMap.h"
@@ skipping 61 matching lines @@
 
 static void updatePathFromPolygonElement(SVGElement* element, Path& path)
 {
     updatePathFromPolylineElement(element, path);
     path.closeSubpath();
 }
 
 static void updatePathFromRectElement(SVGElement* element, Path& path)
 {
     SVGRectElement* rect = toSVGRectElement(element);
+    ASSERT(rect->renderer());
 
     SVGLengthContext lengthContext(element);
     float width = rect->width()->currentValue()->value(lengthContext);
     if (width < 0)
         return;
     float height = rect->height()->currentValue()->value(lengthContext);
     if (height < 0)
         return;
     if (!width && !height)
         return;
-    float x = rect->x()->currentValue()->value(lengthContext);
-    float y = rect->y()->currentValue()->value(lengthContext);
+
+    const SVGLayoutStyle& style = rect->renderer()->style()->svgStyle();
+    float x = lengthContext.valueForLength(style.x(), LengthModeWidth);
+    float y = lengthContext.valueForLength(style.y(), LengthModeHeight);
     float rx = rect->rx()->currentValue()->value(lengthContext);
     float ry = rect->ry()->currentValue()->value(lengthContext);
     bool hasRx = rx > 0;
     bool hasRy = ry > 0;
     if (hasRx || hasRy) {
         if (!hasRx)
             rx = ry;
         else if (!hasRy)
             ry = rx;
 
@@ skipping 20 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