Introduce IntrinsicSizingInfo

third_party/WebKit/Source/core/layout/LayoutImage.cpp

Index: third_party/WebKit/Source/core/layout/LayoutImage.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutImage.cpp b/third_party/WebKit/Source/core/layout/LayoutImage.cpp
index 1671f5d793b3d035b3bef75919555749bd6e8917..66d430fc5f2c01cb9035563db75e05ecf8030dc7 100644
--- a/third_party/WebKit/Source/core/layout/LayoutImage.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutImage.cpp
@@ -284,23 +284,23 @@ bool LayoutImage::nodeAtPoint(HitTestResult& result, const HitTestLocation& loca
     return inside;
 }
 
-void LayoutImage::computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const
+void LayoutImage::computeIntrinsicSizingInfo(IntrinsicSizingInfo& intrinsicSizingInfo) const
 {
-    LayoutReplaced::computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio);
+    LayoutReplaced::computeIntrinsicSizingInfo(intrinsicSizingInfo);
 
     // Our intrinsicSize is empty if we're laying out generated images with relative width/height. Figure out the right intrinsic size to use.
-    if (intrinsicSize.isEmpty() && m_imageResource->imageHasRelativeSize()) {
+    if (intrinsicSizingInfo.size.isEmpty() && m_imageResource->imageHasRelativeSize()) {
         LayoutObject* containingBlock = isOutOfFlowPositioned() ? container() : this->containingBlock();
         if (containingBlock->isBox()) {
             LayoutBox* box = toLayoutBox(containingBlock);
-            intrinsicSize.setWidth(box->availableLogicalWidth().toFloat());
-            intrinsicSize.setHeight(box->availableLogicalHeight(IncludeMarginBorderPadding).toFloat());
+            intrinsicSizingInfo.size.setWidth(box->availableLogicalWidth().toFloat());
+            intrinsicSizingInfo.size.setHeight(box->availableLogicalHeight(IncludeMarginBorderPadding).toFloat());
         }
     }
     // Don't compute an intrinsic ratio to preserve historical WebKit behavior if we're painting alt text and/or a broken image.
     // Video is excluded from this behavior because video elements have a default aspect ratio that a failed poster image load should not override.
     if (m_imageResource && m_imageResource->errorOccurred() && !isVideo()) {
-        intrinsicRatio = 1;
+        intrinsicSizingInfo.aspectRatio = 1;
         return;
     }
 }