Atomic scaling in ImageResource::imageSize()

third_party/WebKit/Source/core/fetch/ImageResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. 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 202 matching lines @@
         return LayoutSize();
 
     LayoutSize size;
 
     if (m_image->isBitmapImage() && shouldRespectImageOrientation == RespectImageOrientation)
         size = LayoutSize(toBitmapImage(m_image.get())->sizeRespectingOrientation());
     else
         size = LayoutSize(m_image->size());
 
     if (sizeType == IntrinsicCorrectedToDPR && m_hasDevicePixelRatioHeaderValue && m_devicePixelRatioHeaderValue > 0)
-        multiplier = 1.0 / m_devicePixelRatioHeaderValue;
+        multiplier = 1 / m_devicePixelRatioHeaderValue;
 
-    if (multiplier == 1.0f)
+    if (multiplier == 1 || m_image->hasRelativeSize())
         return size;
 
     // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.
-    float widthScale = m_image->hasRelativeSize() ? 1.0f : multiplier;
-    float heightScale = m_image->hasRelativeSize() ? 1.0f : multiplier;
     LayoutSize minimumSize(size.width() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit(),
         LayoutUnit(size.height() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit()));
-    size.scale(widthScale, heightScale);
+    size.scale(multiplier);
     size.clampToMinimumSize(minimumSize);
-    ASSERT(multiplier != 1.0f || (size.width().fraction() == 0.0f && size.height().fraction() == 0.0f));
     return size;
 }
 
 void ImageResource::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
 {
     if (m_image)
         m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
 }
 
 void ImageResource::notifyObservers(const IntRect* changeRect)
@@ skipping 201 matching lines @@
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
 bool ImageResource::loadingMultipartContent() const
 {
     return m_loader && m_loader->loadingMultipartContent();
 }
 
 } // namespace blink