Always set the container size for a pAR=none image to the intrinsic size

Source/core/rendering/svg/RenderSVGImage.cpp

 /*
  * Copyright (C) 2006 Alexander Kellett <lypanov@kde.org>
  * Copyright (C) 2006 Apple Computer, Inc.
  * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2007, 2008, 2009 Rob Buis <buis@kde.org>
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 47 matching lines @@
 
 bool RenderSVGImage::updateImageViewport()
 {
     SVGImageElement* image = toSVGImageElement(element());
     FloatRect oldBoundaries = m_objectBoundingBox;
     bool updatedViewport = false;
 
     SVGLengthContext lengthContext(image);
     m_objectBoundingBox = FloatRect(image->x()->currentValue()->value(lengthContext), image->y()->currentValue()->value(lengthContext), image->width()->currentValue()->value(lengthContext), image->height()->currentValue()->value(lengthContext));
 
+    bool boundsChanged = oldBoundaries != m_objectBoundingBox;
+
     // Images with preserveAspectRatio=none should force non-uniform scaling. This can be achieved
     // by setting the image's container size to its intrinsic size.
     // See: http://www.w3.org/TR/SVG/single-page.html, 7.8 The ‘preserveAspectRatio’ attribute.
+    IntSize newViewportSize;
     if (image->preserveAspectRatio()->currentValue()->align() == SVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_NONE) {
-        if (ImageResource* cachedImage = m_imageResource->cachedImage()) {
-            LayoutSize intrinsicSize = cachedImage->imageSizeForRenderer(0, style()->effectiveZoom());
-            if (intrinsicSize != m_imageResource->imageSize(style()->effectiveZoom())) {
-                m_imageResource->setContainerSizeForRenderer(roundedIntSize(intrinsicSize));
-                updatedViewport = true;
-            }
+        LayoutSize intrinsicSize = m_imageResource->intrinsicSize(style()->effectiveZoom());
+        if (intrinsicSize != m_imageResource->imageSize(style()->effectiveZoom())) {
+            newViewportSize = roundedIntSize(intrinsicSize);
+            updatedViewport = true;
         }
+    } else if (boundsChanged) {
+        newViewportSize = enclosingIntRect(m_objectBoundingBox).size();
+        updatedViewport = true;
     }
-
-    if (oldBoundaries != m_objectBoundingBox) {
-        if (!updatedViewport)
-            m_imageResource->setContainerSizeForRenderer(enclosingIntRect(m_objectBoundingBox).size());
-        updatedViewport = true;
-        m_needsBoundariesUpdate = true;
-    }
-
+    if (updatedViewport)
+        m_imageResource->setContainerSizeForRenderer(newViewportSize);
+    m_needsBoundariesUpdate |= boundsChanged;
     return updatedViewport;
 }
 
 void RenderSVGImage::layout()
 {
     ASSERT(needsLayout());
 
     updateImageViewport();
 
     bool transformOrBoundariesUpdate = m_needsTransformUpdate || m_needsBoundariesUpdate;
@@ skipping 129 matching lines @@
 
 void RenderSVGImage::addFocusRingRects(Vector<IntRect>& rects, const LayoutPoint&, const RenderLayerModelObject*)
 {
     // this is called from paint() after the localTransform has already been applied
     IntRect contentRect = enclosingIntRect(paintInvalidationRectInLocalCoordinates());
     if (!contentRect.isEmpty())
         rects.append(contentRect);
 }
 
 } // namespace WebCore