Set intrinsic size for inline SVG earlier

third_party/WebKit/Source/core/layout/svg/LayoutSVGRoot.cpp

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * 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
@@ skipping 30 matching lines @@
 
 LayoutSVGRoot::LayoutSVGRoot(SVGElement* node)
     : LayoutReplaced(node)
     , m_objectBoundingBoxValid(false)
     , m_isLayoutSizeChanged(false)
     , m_needsBoundariesOrTransformUpdate(true)
     , m_hasBoxDecorationBackground(false)
     , m_hasNonIsolatedBlendingDescendants(false)
     , m_hasNonIsolatedBlendingDescendantsDirty(false)
 {
+    LayoutSize intrinsicSize(calculateIntrinsicSize());
+    if (!intrinsicSize.width())
+        intrinsicSize.setWidth(defaultWidth);
+    if (!intrinsicSize.height())
+        intrinsicSize.setHeight(defaultHeight);
+    setIntrinsicSize(intrinsicSize);
 }
 
 LayoutSVGRoot::~LayoutSVGRoot()
 {
 }
 
-void LayoutSVGRoot::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const
+FloatSize LayoutSVGRoot::calculateIntrinsicSize() const
 {
-    // Spec: http://www.w3.org/TR/SVG/coords.html#IntrinsicSizing
-    // SVG needs to specify how to calculate some intrinsic sizing properties to enable inclusion within other languages.
-    // The intrinsic width and height of the viewport of SVG content must be determined from the 'width' and 'height' attributes.
     SVGSVGElement* svg = toSVGSVGElement(node());
     ASSERT(svg);
 
-    // The intrinsic aspect ratio of the viewport of SVG content is necessary for example, when including SVG from an 'object'
-    // element in HTML styled with CSS. It is possible (indeed, common) for an SVG graphic to have an intrinsic aspect ratio but
-    // not to have an intrinsic width or height. The intrinsic aspect ratio must be calculated based upon the following rules:
-    // - The aspect ratio is calculated by dividing a width by a height.
-    // - If the 'width' and 'height' of the rootmost 'svg' element are both specified with unit identifiers (in, mm, cm, pt, pc,
-    //   px, em, ex) or in user units, then the aspect ratio is calculated from the 'width' and 'height' attributes after
-    //   resolving both values to user units.
-    intrinsicSize.setWidth(floatValueForLength(svg->intrinsicWidth(), 0));
-    intrinsicSize.setHeight(floatValueForLength(svg->intrinsicHeight(), 0));
+    return FloatSize(floatValueForLength(svg->intrinsicWidth(), 0), floatValueForLength(svg->intrinsicHeight(), 0));
+}
+
+void LayoutSVGRoot::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const
+{
+    // https://www.w3.org/TR/SVG/coords.html#IntrinsicSizing
+    intrinsicSize = calculateIntrinsicSize();
 
     if (!isHorizontalWritingMode())
         intrinsicSize = intrinsicSize.transposedSize();
 
     if (!intrinsicSize.isEmpty()) {
         intrinsicRatio = intrinsicSize.width() / static_cast<double>(intrinsicSize.height());
     } else {
-        // - If either/both of the 'width' and 'height' of the rootmost 'svg' element are in percentage units (or omitted), the
-        //   aspect ratio is calculated from the width and height values of the 'viewBox' specified for the current SVG document
-        //   fragment. If the 'viewBox' is not correctly specified, or set to 'none', the intrinsic aspect ratio cannot be
-        //   calculated and is considered unspecified.
+        SVGSVGElement* svg = toSVGSVGElement(node());
+        ASSERT(svg);
+
         FloatSize viewBoxSize = svg->viewBox()->currentValue()->value().size();
         if (!viewBoxSize.isEmpty()) {
             // The viewBox can only yield an intrinsic ratio, not an intrinsic size.
             intrinsicRatio = viewBoxSize.width() / static_cast<double>(viewBoxSize.height());
             if (!isHorizontalWritingMode())
                 intrinsicRatio = 1 / intrinsicRatio;
         }
     }
 }
 
@@ skipping 314 matching lines @@
             updateHitTestResult(result, pointInBorderBox);
             if (!result.addNodeToListBasedTestResult(node(), locationInContainer, boundsRect))
                 return true;
         }
     }
 
     return false;
 }
 
 }