Remove zoom() and effectiveZoom().

sky/engine/core/fetch/ImageResource.h

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller <mueller@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
     version 2 of the License, or (at your option) any later version.
@@ skipping 43 matching lines @@
     virtual void load(ResourceFetcher*, const ResourceLoaderOptions&) override;
 
     blink::Image* image(); // Returns the nullImage() if the image is not available yet.
     blink::Image* imageForRenderer(const RenderObject*); // Returns the nullImage() if the image is not available yet.
     bool hasImage() const { return m_image.get(); }
     bool currentFrameKnownToBeOpaque(const RenderObject*); // Side effect: ensures decoded image is in cache, therefore should only be called when about to draw the image.
 
     static std::pair<blink::Image*, float> brokenImage(float deviceScaleFactor); // Returns an image and the image's resolution scale factor.
     bool willPaintBrokenImage() const;
 
-    bool canRender(const RenderObject& renderer, float multiplier) { return !errorOccurred() && !imageSizeForRenderer(&renderer, multiplier).isEmpty(); }
+    bool canRender(const RenderObject& renderer) { return !errorOccurred() && !imageSizeForRenderer(&renderer).isEmpty(); }
 
-    void setContainerSizeForRenderer(const ImageResourceClient*, const IntSize&, float);
+    void setContainerSizeForRenderer(const ImageResourceClient*, const IntSize&);
     bool usesImageContainerSize() const;
     bool imageHasRelativeWidth() const;
     bool imageHasRelativeHeight() const;
     // The device pixel ratio we got from the server for this image, or 1.0.
     float devicePixelRatioHeaderValue() const { return m_devicePixelRatioHeaderValue; }
     bool hasDevicePixelRatioHeaderValue() const { return m_hasDevicePixelRatioHeaderValue; }
 
     enum SizeType {
         NormalSize, // Report the size of the image associated with a certain renderer
         IntrinsicSize // Report the intrinsic size, i.e. ignore whatever has been set extrinsically.
     };
-    // This method takes a zoom multiplier that can be used to increase the natural size of the image by the zoom.
-    LayoutSize imageSizeForRenderer(const RenderObject*, float multiplier, SizeType = NormalSize); // returns the size of the complete image.
+    LayoutSize imageSizeForRenderer(const RenderObject*, SizeType = NormalSize); // returns the size of the complete image.
     void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     virtual void didAddClient(ResourceClient*) override;
     virtual void didRemoveClient(ResourceClient*) override;
 
     virtual void allClientsRemoved() override;
 
     virtual void appendData(const char*, int) override;
     virtual void error(Resource::Status) override;
     virtual void responseReceived(const ResourceResponse&) override;
@@ skipping 22 matching lines @@
 
     void setCustomAcceptHeader();
     void createImage();
     void updateImage(bool allDataReceived);
     void clearImage();
     // If not null, changeRect is the changed part of the image.
     void notifyObservers(const IntRect* changeRect = 0);
 
     virtual void switchClientsToRevalidatedResource() override;
 
-    typedef pair<IntSize, float> SizeAndZoom;
-    typedef HashMap<const ImageResourceClient*, SizeAndZoom> ContainerSizeRequests;
+    typedef HashMap<const ImageResourceClient*, IntSize> ContainerSizeRequests;
     ContainerSizeRequests m_pendingContainerSizeRequests;
     float m_devicePixelRatioHeaderValue;
 
     RefPtr<blink::Image> m_image;
     bool m_loadingMultipartContent;
     bool m_hasDevicePixelRatioHeaderValue;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 }
 
 #endif