Clean up Image::computeIntrinsicDimensions

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 21 matching lines @@
 #include "core/layout/svg/SVGResourcesCache.h"
 #include "core/paint/PaintLayer.h"
 #include "core/paint/SVGRootPainter.h"
 #include "core/svg/SVGElement.h"
 #include "core/svg/SVGSVGElement.h"
 #include "core/svg/graphics/SVGImage.h"
 #include "platform/LengthFunctions.h"
 
 namespace blink {
 
-namespace {
-
-FloatSize calculateIntrinsicSize(const SVGSVGElement& svg)
-{
-    return FloatSize(floatValueForLength(svg.intrinsicWidth(), 0), floatValueForLength(svg.intrinsicHeight(), 0));
-}
-
-} // namespace
-
 LayoutSVGRoot::LayoutSVGRoot(SVGElement* node)
     : LayoutReplaced(node)
     , m_objectBoundingBoxValid(false)
     , m_isLayoutSizeChanged(false)
     , m_needsBoundariesOrTransformUpdate(true)
     , m_hasBoxDecorationBackground(false)
     , m_hasNonIsolatedBlendingDescendants(false)
     , m_hasNonIsolatedBlendingDescendantsDirty(false)
 {
     SVGSVGElement* svg = toSVGSVGElement(node);
     ASSERT(svg);
 
-    LayoutSize intrinsicSize(calculateIntrinsicSize(*svg));
+    LayoutSize intrinsicSize(svg->intrinsicWidth(), svg->intrinsicHeight());
     if (!svg->hasIntrinsicWidth())
         intrinsicSize.setWidth(LayoutUnit(defaultWidth));
     if (!svg->hasIntrinsicHeight())
         intrinsicSize.setHeight(LayoutUnit(defaultHeight));
     setIntrinsicSize(intrinsicSize);
 }
 
 LayoutSVGRoot::~LayoutSVGRoot()
 {
 }
 
 void LayoutSVGRoot::computeIntrinsicSizingInfo(IntrinsicSizingInfo& intrinsicSizingInfo) const
 {
     // https://www.w3.org/TR/SVG/coords.html#IntrinsicSizing
 
     SVGSVGElement* svg = toSVGSVGElement(node());
     ASSERT(svg);
 
-    intrinsicSizingInfo.size = calculateIntrinsicSize(*svg);
+    intrinsicSizingInfo.size = FloatSize(svg->intrinsicWidth(), svg->intrinsicHeight());
     intrinsicSizingInfo.hasWidth = svg->hasIntrinsicWidth();
     intrinsicSizingInfo.hasHeight = svg->hasIntrinsicHeight();
 
     if (!intrinsicSizingInfo.size.isEmpty()) {
         intrinsicSizingInfo.aspectRatio = intrinsicSizingInfo.size.width() / static_cast<double>(intrinsicSizingInfo.size.height());
     } else {
         FloatSize viewBoxSize = svg->viewBox()->currentValue()->value().size();
         if (!viewBoxSize.isEmpty()) {
             // The viewBox can only yield an intrinsic ratio, not an intrinsic size.
             intrinsicSizingInfo.aspectRatio = viewBoxSize.width() / static_cast<double>(viewBoxSize.height());
@@ skipping 311 matching lines @@
             updateHitTestResult(result, pointInBorderBox);
             if (result.addNodeToListBasedTestResult(node(), locationInContainer, boundsRect) == StopHitTesting)
                 return true;
         }
     }
 
     return false;
 }
 
 } // namespace blink