[svg2] Make 'width' and 'height' presentation attributes

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 141 matching lines @@
             imageLoader().updateFromElement(ImageLoader::UpdateIgnorePreviousError);
         else
             m_needsLoaderURIUpdate = true;
         return;
     }
 
     LayoutObject* renderer = this->layoutObject();
     if (!renderer)
         return;
 
-    if (isLengthAttribute) {
-        if (toLayoutSVGImage(renderer)->updateImageViewport())
-            markForLayoutAndParentResourceInvalidation(renderer);
-        return;
-    }
-
-    if (attrName == SVGNames::preserveAspectRatioAttr) {
+    if (isLengthAttribute || attrName == SVGNames::preserveAspectRatioAttr) {
+        // FIXME: if isLengthAttribute then we should avoid this
+        // call if the viewport didn't change, however since we don't
+        // have the computed style yet we can't use updateImageViewport.
+        // See http://crbug.com/466200.
         markForLayoutAndParentResourceInvalidation(renderer);
         return;
     }
 
     ASSERT_NOT_REACHED();
 }
 
 bool SVGImageElement::selfHasRelativeLengths() const
 {
     return m_x->currentValue()->isRelative()
@@ skipping 50 matching lines @@
     return AtomicString(hrefString());
 }
 
 void SVGImageElement::didMoveToNewDocument(Document& oldDocument)
 {
     imageLoader().elementDidMoveToNewDocument();
     SVGGraphicsElement::didMoveToNewDocument(oldDocument);
 }
 
 } // namespace blink