Remove Image::computeIntrinsicDimensions()

third_party/WebKit/Source/core/paint/SVGImagePainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/SVGImagePainter.h"
 
 #include "core/layout/ImageQualityController.h"
 #include "core/layout/LayoutImageResource.h"
 #include "core/layout/svg/LayoutSVGImage.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
 #include "core/paint/LayoutObjectDrawingRecorder.h"
 #include "core/paint/ObjectPainter.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/SVGPaintContext.h"
 #include "core/paint/TransformRecorder.h"
 #include "core/svg/SVGImageElement.h"
+#include "core/svg/graphics/SVGImage.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace blink {
 
 void SVGImagePainter::paint(const PaintInfo& paintInfo)
 {
     if (paintInfo.phase != PaintPhaseForeground
         || m_layoutSVGImage.style()->visibility() == HIDDEN
         || !m_layoutSVGImage.imageResource()->hasImage())
@@ skipping 46 matching lines @@
 
 FloatSize SVGImagePainter::computeImageViewportSize() const
 {
     ASSERT(m_layoutSVGImage.imageResource()->hasImage());
 
     if (toSVGImageElement(m_layoutSVGImage.element())->preserveAspectRatio()->currentValue()->align() != SVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_NONE)
         return m_layoutSVGImage.objectBoundingBox().size();
 
     ImageResource* cachedImage = m_layoutSVGImage.imageResource()->cachedImage();
 
-    // Images with preserveAspectRatio=none should force non-uniform
-    // scaling. This can be achieved by setting the image's container size to
-    // its viewport size (i.e. if a viewBox is available - use that - else use intrinsic size.)
-    // See: http://www.w3.org/TR/SVG/single-page.html, 7.8 The 'preserveAspectRatio' attribute.
-    FloatSize intrinsicSize;
-    FloatSize intrinsicRatio;
-    cachedImage->computeIntrinsicDimensions(intrinsicSize, intrinsicRatio);
-    return intrinsicRatio;
+    // Images with preserveAspectRatio=none should force non-uniform scaling. This can be achieved
+    // by setting the image's container size to its viewport size (i.e. concrete object size
+    // returned by the default sizing algorithm.)  See
+    // https://www.w3.org/TR/SVG/single-page.html#coords-PreserveAspectRatioAttribute and
+    // https://drafts.csswg.org/css-images-3/#default-sizing.
+
+    // Avoid returning the size of the broken image.
+    if (cachedImage->errorOccurred())
+        return FloatSize();
+
+    if (cachedImage->image()->isSVGImage())
+        return toSVGImage(cachedImage->image())->concreteObjectSize(m_layoutSVGImage.objectBoundingBox().size());
+
+    return FloatSize(cachedImage->image()->size());
 }
 
 } // namespace blink