Simplify contain constraint calculation

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 194 matching lines @@
             return FloatSize(defaultObjectSize.width(), intrinsicSizingInfo.size.height());
 
         return FloatSize(resolveWidthForRatio(intrinsicSizingInfo.size.height(), intrinsicSizingInfo.aspectRatio), intrinsicSizingInfo.size.height());
     }
 
     if (!intrinsicSizingInfo.aspectRatio.isEmpty()) {
         // "A contain constraint is resolved by setting the concrete object size to the largest
         //  rectangle that has the object's intrinsic aspect ratio and additionally has neither
         //  width nor height larger than the constraint rectangle's width and height, respectively."
         float solutionWidth = resolveWidthForRatio(defaultObjectSize.height(), intrinsicSizingInfo.aspectRatio);
+        if (solutionWidth <= defaultObjectSize.width())
+            return FloatSize(solutionWidth, defaultObjectSize.height());
+
         float solutionHeight = resolveHeightForRatio(defaultObjectSize.width(), intrinsicSizingInfo.aspectRatio);
-        if (solutionWidth <= defaultObjectSize.width()) {
-            if (solutionHeight <= defaultObjectSize.height()) {
-                float areaOne = solutionWidth * defaultObjectSize.height();
-                float areaTwo = defaultObjectSize.width() * solutionHeight;
-                if (areaOne < areaTwo)
-                    return FloatSize(defaultObjectSize.width(), solutionHeight);
-                return FloatSize(solutionWidth, defaultObjectSize.height());
-            }
-
-            return FloatSize(solutionWidth, defaultObjectSize.height());
-        }
-
-        ASSERT(solutionHeight <= defaultObjectSize.height());
         return FloatSize(defaultObjectSize.width(), solutionHeight);
     }
 
     return defaultObjectSize;
 }
 
 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)
@@ skipping 349 matching lines @@
 
     return m_page ? SizeAvailable : SizeUnavailable;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 } // namespace blink