Only communicate CSSPrimitiveValue references from SVGLength

third_party/WebKit/Source/core/svg/SVGRectElement.cpp

Index: third_party/WebKit/Source/core/svg/SVGRectElement.cpp
diff --git a/third_party/WebKit/Source/core/svg/SVGRectElement.cpp b/third_party/WebKit/Source/core/svg/SVGRectElement.cpp
index c7e08f7d9ed50e4482a84bda0135207110ee97b1..4320bcb8a0fce09668357525c67531bd249909a4 100644
--- a/third_party/WebKit/Source/core/svg/SVGRectElement.cpp
+++ b/third_party/WebKit/Source/core/svg/SVGRectElement.cpp
@@ -121,29 +121,28 @@ void SVGRectElement::collectStyleForPresentationAttribute(
     const AtomicString& value,
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
-  if (property == m_x)
-    addPropertyToPresentationAttributeStyle(
-        style, CSSPropertyX, m_x->currentValue()->asCSSPrimitiveValue());
-  else if (property == m_y)
-    addPropertyToPresentationAttributeStyle(
-        style, CSSPropertyY, m_y->currentValue()->asCSSPrimitiveValue());
-  else if (property == m_width)
-    addPropertyToPresentationAttributeStyle(
-        style, CSSPropertyWidth,
-        m_width->currentValue()->asCSSPrimitiveValue());
-  else if (property == m_height)
-    addPropertyToPresentationAttributeStyle(
-        style, CSSPropertyHeight,
-        m_height->currentValue()->asCSSPrimitiveValue());
-  else if (property == m_rx)
-    addPropertyToPresentationAttributeStyle(
-        style, CSSPropertyRx, m_rx->currentValue()->asCSSPrimitiveValue());
-  else if (property == m_ry)
-    addPropertyToPresentationAttributeStyle(
-        style, CSSPropertyRy, m_ry->currentValue()->asCSSPrimitiveValue());
-  else
+  if (property == m_x) {
+    addPropertyToPresentationAttributeStyle(style, CSSPropertyX,
+                                            m_x->cssValue());
+  } else if (property == m_y) {
+    addPropertyToPresentationAttributeStyle(style, CSSPropertyY,
+                                            m_y->cssValue());
+  } else if (property == m_width) {
+    addPropertyToPresentationAttributeStyle(style, CSSPropertyWidth,
+                                            m_width->cssValue());
+  } else if (property == m_height) {
+    addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight,
+                                            m_height->cssValue());
+  } else if (property == m_rx) {
+    addPropertyToPresentationAttributeStyle(style, CSSPropertyRx,
+                                            m_rx->cssValue());
+  } else if (property == m_ry) {
+    addPropertyToPresentationAttributeStyle(style, CSSPropertyRy,
+                                            m_ry->cssValue());
+  } else {
     SVGGeometryElement::collectStyleForPresentationAttribute(name, value,
                                                              style);
+  }
 }
 
 void SVGRectElement::svgAttributeChanged(const QualifiedName& attrName) {