Remove zoom() and effectiveZoom().

sky/engine/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 106 matching lines @@
     ASSERT(resourceToRevalidate()->isImage());
     // Pending container size requests need to be transferred to the revalidated resource.
     if (!m_pendingContainerSizeRequests.isEmpty()) {
         // A copy of pending size requests is needed as they are deleted during Resource::switchClientsToRevalidateResouce().
         ContainerSizeRequests switchContainerSizeRequests;
         for (ContainerSizeRequests::iterator it = m_pendingContainerSizeRequests.begin(); it != m_pendingContainerSizeRequests.end(); ++it)
             switchContainerSizeRequests.set(it->key, it->value);
         Resource::switchClientsToRevalidatedResource();
         ImageResource* revalidatedImageResource = toImageResource(resourceToRevalidate());
         for (ContainerSizeRequests::iterator it = switchContainerSizeRequests.begin(); it != switchContainerSizeRequests.end(); ++it)
-            revalidatedImageResource->setContainerSizeForRenderer(it->key, it->value.first, it->value.second);
+            revalidatedImageResource->setContainerSizeForRenderer(it->key, it->value);
         return;
     }
 
     Resource::switchClientsToRevalidatedResource();
 }
 
 bool ImageResource::isSafeToUnlock() const
 {
     // Note that |m_image| holds a reference to |m_data| in addition to the one held by the Resource parent class.
     return !m_image || (m_image->hasOneRef() && m_data->refCount() == 2);
@@ skipping 60 matching lines @@
         // when they need the real, deviceScaleFactor-appropriate broken image icon.
         return brokenImage(1).first;
     }
 
     if (!m_image)
         return blink::Image::nullImage();
 
     return m_image.get();
 }
 
-void ImageResource::setContainerSizeForRenderer(const ImageResourceClient* renderer, const IntSize& containerSize, float containerZoom)
+void ImageResource::setContainerSizeForRenderer(const ImageResourceClient* renderer, const IntSize& containerSize)
 {
     if (containerSize.isEmpty())
         return;
     ASSERT(renderer);
-    ASSERT(containerZoom);
     if (!m_image) {
-        m_pendingContainerSizeRequests.set(renderer, SizeAndZoom(containerSize, containerZoom));
+        m_pendingContainerSizeRequests.set(renderer, containerSize);
         return;
     }
 
     m_image->setContainerSize(containerSize);
 }
 
 bool ImageResource::usesImageContainerSize() const
 {
     if (m_image)
         return m_image->usesContainerSize();
@@ skipping 10 matching lines @@
 }
 
 bool ImageResource::imageHasRelativeHeight() const
 {
     if (m_image)
         return m_image->hasRelativeHeight();
 
     return false;
 }
 
-LayoutSize ImageResource::imageSizeForRenderer(const RenderObject* renderer, float multiplier, SizeType sizeType)
+LayoutSize ImageResource::imageSizeForRenderer(const RenderObject* renderer, SizeType sizeType)
 {
     ASSERT(!isPurgeable());
 
     if (!m_image)
         return IntSize();
 
-    LayoutSize imageSize;
+    if (m_image->isBitmapImage() && (renderer && renderer->shouldRespectImageOrientation() == RespectImageOrientation))
+        return toBitmapImage(m_image.get())->sizeRespectingOrientation();
 
-    if (m_image->isBitmapImage() && (renderer && renderer->shouldRespectImageOrientation() == RespectImageOrientation))
-        imageSize = toBitmapImage(m_image.get())->sizeRespectingOrientation();
-    else
-        imageSize = m_image->size();
-
-    if (multiplier == 1.0f)
-        return imageSize;
-
-    // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.
-    float widthScale = m_image->hasRelativeWidth() ? 1.0f : multiplier;
-    float heightScale = m_image->hasRelativeHeight() ? 1.0f : multiplier;
-    LayoutSize minimumSize(imageSize.width() > 0 ? 1 : 0, imageSize.height() > 0 ? 1 : 0);
-    imageSize.scale(widthScale, heightScale);
-    imageSize.clampToMinimumSize(minimumSize);
-    ASSERT(multiplier != 1.0f || (imageSize.width().fraction() == 0.0f && imageSize.height().fraction() == 0.0f));
-    return imageSize;
+    return m_image->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 21 matching lines @@
     // Create the image if it doesn't yet exist.
     if (m_image)
         return;
 
     m_image = BitmapImage::create(this);
 
     if (m_image) {
         // Send queued container size requests.
         if (m_image->usesContainerSize()) {
             for (ContainerSizeRequests::iterator it = m_pendingContainerSizeRequests.begin(); it != m_pendingContainerSizeRequests.end(); ++it)
-                setContainerSizeForRenderer(it->key, it->value.first, it->value.second);
+                setContainerSizeForRenderer(it->key, it->value);
         }
         m_pendingContainerSizeRequests.clear();
     }
 }
 
 inline void ImageResource::clearImage()
 {
     // If our Image has an observer, it's always us so we need to clear the back pointer
     // before dropping our reference.
     if (m_image)
@@ skipping 119 matching lines @@
 
 bool ImageResource::currentFrameKnownToBeOpaque(const RenderObject* renderer)
 {
     blink::Image* image = imageForRenderer(renderer);
     if (image->isBitmapImage())
         image->nativeImageForCurrentFrame(); // force decode
     return image->currentFrameKnownToBeOpaque();
 }
 
 } // namespace blink