Rename imageSizeForLayoutObject() to imageSize()

third_party/WebKit/Source/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 11 matching lines @@
 
 #ifndef ImageResource_h
 #define ImageResource_h
 
 #include "core/CoreExport.h"
 #include "core/fetch/ResourcePtr.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/IntSizeHash.h"
 #include "platform/geometry/LayoutSize.h"
 #include "platform/graphics/ImageObserver.h"
+#include "platform/graphics/ImageOrientation.h"
 #include "wtf/HashMap.h"
 
 namespace blink {
 
 class ImageResourceClient;
 class FetchRequest;
 class ResourceFetcher;
 class FloatSize;
 class Length;
 class MemoryCache;
@@ skipping 19 matching lines @@
     bool hasImage() const { return m_image.get(); }
     // Side effect: ensures decoded image is in cache, therefore should only be called when about to draw the image.
     // FIXME: Decoding image on the main thread is expensive, so rather than forcing decode, consider returning false
     // when image is not decoded yet, as we do in case of deferred decoding.
     bool currentFrameKnownToBeOpaque(const LayoutObject*);
 
     static std::pair<blink::Image*, float> brokenImage(float deviceScaleFactor); // Returns an image and the image's resolution scale factor.
     bool willPaintBrokenImage() const;
 
     // Assumes that image rotation or scale doesn't effect the image size being empty or not.
-    bool canRender() { return !errorOccurred() && !imageSizeForLayoutObject(nullptr, 1).isEmpty(); }
+    bool canRender() { return !errorOccurred() && !imageSize(DoNotRespectImageOrientation, 1).isEmpty(); }

[Yoav Weiss, 2015/11/24 10:29:07]

It adds an extra call, but it might be better to have the
shouldRespectImageOrientation in a single location and just call it here with
nullptr rather than `DoNotRespectImageOrientation`

[davve, 2015/11/24 13:33:33]

fetch/ shouldn't depend on the rest of core/ (see fetch/DEPS). Not having to
call LayoutObject code from fetch/ is a big part of this CL, even though I'm not
sure we're able to remove every dependency at this point.

If you really like to, I can add the enum parameter to canRender() and pass it
along to imageSize?

 
     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 {
         IntrinsicSize, // Report the intrinsic size.
         IntrinsicCorrectedToDPR, // Report the intrinsic size corrected to account for image density.
     };
     // This method takes a zoom multiplier that can be used to increase the natural size of the image by the zoom.
-    LayoutSize imageSizeForLayoutObject(const LayoutObject*, float multiplier, SizeType = IntrinsicSize); // returns the size of the complete image.
+    LayoutSize imageSize(RespectImageOrientationEnum shouldRespectImageOrientation, float multiplier, SizeType = IntrinsicSize);
     void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio);
 
     bool isAccessAllowed(SecurityOrigin*);
 
     void updateImageAnimationPolicy();
 
     void didAddClient(ResourceClient*) override;
     void didRemoveClient(ResourceClient*) override;
 
     void allClientsRemoved() override;
@@ skipping 49 matching lines @@
 
     RefPtr<blink::Image> m_image;
     bool m_hasDevicePixelRatioHeaderValue;
 };
 
 DEFINE_RESOURCE_TYPE_CASTS(Image);
 
 }
 
 #endif