Introduce IntrinsicSizingInfo

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 50 matching lines @@
 }
 
 FloatSize LayoutSVGRoot::calculateIntrinsicSize() const
 {
     SVGSVGElement* svg = toSVGSVGElement(node());
     ASSERT(svg);
 
     return FloatSize(floatValueForLength(svg->intrinsicWidth(), 0), floatValueForLength(svg->intrinsicHeight(), 0));
 }
 
-void LayoutSVGRoot::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const
+void LayoutSVGRoot::computeIntrinsicSizingInfo(IntrinsicSizingInfo& intrinsicSizingInfo) const
 {
     // https://www.w3.org/TR/SVG/coords.html#IntrinsicSizing
-    intrinsicSize = calculateIntrinsicSize();
+    intrinsicSizingInfo.size = calculateIntrinsicSize();
 
     if (!isHorizontalWritingMode())
-        intrinsicSize = intrinsicSize.transposedSize();
+        intrinsicSizingInfo.size = intrinsicSizingInfo.size.transposedSize();
 
-    if (!intrinsicSize.isEmpty()) {
-        intrinsicRatio = intrinsicSize.width() / static_cast<double>(intrinsicSize.height());
+    if (!intrinsicSizingInfo.size.isEmpty()) {
+        intrinsicSizingInfo.aspectRatio = intrinsicSizingInfo.size.width() / static_cast<double>(intrinsicSizingInfo.size.height());
     } else {
         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());
+            intrinsicSizingInfo.aspectRatio = viewBoxSize.width() / static_cast<double>(viewBoxSize.height());
             if (!isHorizontalWritingMode())
-                intrinsicRatio = 1 / intrinsicRatio;
+                intrinsicSizingInfo.aspectRatio = 1 / intrinsicSizingInfo.aspectRatio;
         }
     }
 }
 
 bool LayoutSVGRoot::isEmbeddedThroughSVGImage() const
 {
     return SVGImage::isInSVGImage(toSVGSVGElement(node()));
 }
 
 bool LayoutSVGRoot::isEmbeddedThroughFrameContainingSVGDocument() const
@@ skipping 298 matching lines @@
             updateHitTestResult(result, pointInBorderBox);
             if (result.addNodeToListBasedTestResult(node(), locationInContainer, boundsRect) == StopHitTesting)
                 return true;
         }
     }
 
     return false;
 }
 
 } // namespace blink