Align IntrinsicSizingInfo with computeIntrinsicDimensions

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 138 matching lines @@
     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);
 
     LayoutBox::IntrinsicSizingInfo intrinsicSizingInfo;
     layoutObject->computeIntrinsicSizingInfo(intrinsicSizingInfo);
 
-    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);
+    if (intrinsicSizingInfo.size.isEmpty() && !intrinsicSizingInfo.aspectRatio.isEmpty()) {
+        if (!intrinsicSizingInfo.size.width() && intrinsicSizingInfo.size.height()) {
+            intrinsicSizingInfo.size.setWidth(
+                intrinsicSizingInfo.size.height() * intrinsicSizingInfo.aspectRatio.width() / intrinsicSizingInfo.aspectRatio.height());
+        } else if (intrinsicSizingInfo.size.width() && !intrinsicSizingInfo.size.height()) {
+            intrinsicSizingInfo.size.setHeight(
+                intrinsicSizingInfo.size.width() * intrinsicSizingInfo.aspectRatio.height() / intrinsicSizingInfo.aspectRatio.width());
+        }
     }
 
     // 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 (intrinsicSizingInfo.size.isEmpty())
         intrinsicSizingInfo.size = rootElement->currentViewBoxRect().size();
 
     if (!intrinsicSizingInfo.size.isEmpty())
@@ skipping 326 matching lines @@
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 } // namespace blink