Only communicate CSSPrimitiveValue references from SVGLength

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  *
  * 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,
@@ skipping 103 matching lines @@
 
   path.addRect(FloatRect(x, y, width, height));
   return path;
 }
 
 void SVGRectElement::collectStyleForPresentationAttribute(
     const QualifiedName& name,
     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) {
   if (attrName == SVGNames::xAttr || attrName == SVGNames::yAttr ||
       attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr ||
       attrName == SVGNames::rxAttr || attrName == SVGNames::ryAttr) {
     SVGElement::InvalidationGuard invalidationGuard(this);
 
     invalidateSVGPresentationAttributeStyle();
     setNeedsStyleRecalc(LocalStyleChange,
@@ skipping 20 matching lines @@
          m_height->currentValue()->isRelative() ||
          m_rx->currentValue()->isRelative() ||
          m_ry->currentValue()->isRelative();
 }
 
 LayoutObject* SVGRectElement::createLayoutObject(const ComputedStyle&) {
   return new LayoutSVGRect(this);
 }
 
 }  // namespace blink