Introduce IntrinsicSizingInfo

third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 135 matching lines @@
         return IntSize();
 
     // If a container size is available it has precedence.
     IntSize containerSize = layoutObject->containerSize();
     if (!containerSize.isEmpty())
         return containerSize;
 
     // Assure that a container size is always given for a non-identity zoom level.
     ASSERT(layoutObject->style()->effectiveZoom() == 1);
 
-    FloatSize intrinsicSize;
-    double intrinsicRatio = 0;
-    layoutObject->computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio);
+    LayoutBox::IntrinsicSizingInfo intrinsicSizingInfo;
+    layoutObject->computeIntrinsicSizingInfo(intrinsicSizingInfo);
 
-    if (intrinsicSize.isEmpty() && intrinsicRatio) {
-        if (!intrinsicSize.width() && intrinsicSize.height())
-            intrinsicSize.setWidth(intrinsicSize.height() * intrinsicRatio);
-        else if (intrinsicSize.width() && !intrinsicSize.height())
-            intrinsicSize.setHeight(intrinsicSize.width() / intrinsicRatio);
+    if (intrinsicSizingInfo.size.isEmpty() && intrinsicSizingInfo.aspectRatio) {
+        if (!intrinsicSizingInfo.size.width() && intrinsicSizingInfo.size.height())
+            intrinsicSizingInfo.size.setWidth(intrinsicSizingInfo.size.height() * intrinsicSizingInfo.aspectRatio);
+        else if (intrinsicSizingInfo.size.width() && !intrinsicSizingInfo.size.height())
+            intrinsicSizingInfo.size.setHeight(intrinsicSizingInfo.size.width() / intrinsicSizingInfo.aspectRatio);
     }
 
     // TODO(davve): In order to maintain aspect ratio the intrinsic
     // size is faked from the viewBox as a last resort. This may cause
     // unwanted side effects. Preferably we should be able to signal
     // the intrinsic ratio in another way.
-    if (intrinsicSize.isEmpty())
-        intrinsicSize = rootElement->currentViewBoxRect().size();
+    if (intrinsicSizingInfo.size.isEmpty())
+        intrinsicSizingInfo.size = rootElement->currentViewBoxRect().size();
 
-    if (!intrinsicSize.isEmpty())
-        return expandedIntSize(intrinsicSize);
+    if (!intrinsicSizingInfo.size.isEmpty())
+        return expandedIntSize(intrinsicSizingInfo.size);
 
     // As last resort, use CSS replaced element fallback size.
     return IntSize(300, 150);
 }
 
 void SVGImage::drawForContainer(SkCanvas* canvas, const SkPaint& paint, const FloatSize containerSize, float zoom, const FloatRect& dstRect,
     const FloatRect& srcRect, const KURL& url)
 {
     if (!m_page)
         return;
@@ skipping 315 matching lines @@
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 } // namespace blink