Only communicate CSSPrimitiveValue references from SVGLength

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

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Rob Buis <buis@kde.org>
  * Copyright (C) 2006 Alexander Kellett <lypanov@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.
  *
@@ skipping 72 matching lines @@
   }
 
   return true;
 }
 
 void SVGImageElement::collectStyleForPresentationAttribute(
     const QualifiedName& name,
     const AtomicString& value,
     MutableStylePropertySet* style) {
   SVGAnimatedPropertyBase* property = propertyFromAttribute(name);
-  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_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->cssValue());
+  } else if (property == m_height) {
+    addPropertyToPresentationAttributeStyle(style, CSSPropertyHeight,
+                                            m_height->cssValue());
+  } else if (property == m_x) {
+    addPropertyToPresentationAttributeStyle(style, CSSPropertyX,
+                                            m_x->cssValue());
+  } else if (property == m_y) {
+    addPropertyToPresentationAttributeStyle(style, CSSPropertyY,
+                                            m_y->cssValue());
+  } else {
     SVGGraphicsElement::collectStyleForPresentationAttribute(name, value,
                                                              style);
+  }
 }
 
 void SVGImageElement::svgAttributeChanged(const QualifiedName& attrName) {
   bool isLengthAttribute =
       attrName == SVGNames::xAttr || attrName == SVGNames::yAttr ||
       attrName == SVGNames::widthAttr || attrName == SVGNames::heightAttr;
 
   if (isLengthAttribute || attrName == SVGNames::preserveAspectRatioAttr) {
     SVGElement::InvalidationGuard invalidationGuard(this);
 
@@ skipping 79 matching lines @@
 const AtomicString SVGImageElement::imageSourceURL() const {
   return AtomicString(hrefString());
 }
 
 void SVGImageElement::didMoveToNewDocument(Document& oldDocument) {
   imageLoader().elementDidMoveToNewDocument();
   SVGGraphicsElement::didMoveToNewDocument(oldDocument);
 }
 
 }  // namespace blink