| Index: third_party/WebKit/Source/core/fetch/ImageResource.h
|
| diff --git a/third_party/WebKit/Source/core/fetch/ImageResource.h b/third_party/WebKit/Source/core/fetch/ImageResource.h
|
| index aeb64c3b1789c7d6fe96861b7b86a972bfe00f3c..c65fc23407a2cbf8c726113ee0247b0d0f9f27a7 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ImageResource.h
|
| +++ b/third_party/WebKit/Source/core/fetch/ImageResource.h
|
| @@ -72,7 +72,7 @@ public:
|
| bool willPaintBrokenImage() const;
|
|
|
| // Assumes that image rotation or scale doesn't effect the image size being empty or not.
|
| - bool canRender() { return !errorOccurred() && !imageSize(DoNotRespectImageOrientation, 1).isEmpty(); }
|
| + bool canRender() { return !errorOccurred() && !defaultConcreteObjectSize(DoNotRespectImageOrientation, 1).isEmpty(); }
|
|
|
| bool usesImageContainerSize() const;
|
| bool imageHasRelativeSize() const;
|
| @@ -85,7 +85,11 @@ public:
|
| 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 imageSize(RespectImageOrientationEnum shouldRespectImageOrientation, float multiplier, SizeType = IntrinsicSize);
|
| + LayoutSize concreteObjectSize(const FloatSize& defaultObjectSize, RespectImageOrientationEnum shouldRespectImageOrientation, float multiplier, SizeType = IntrinsicSize);
|
| + LayoutSize defaultConcreteObjectSize(RespectImageOrientationEnum shouldRespectImageOrientation, float multiplier, SizeType sizeType = IntrinsicSize)
|
| + {
|
| + return concreteObjectSize(FloatSize(300, 150), shouldRespectImageOrientation, multiplier, sizeType);
|
| + }
|
| void computeIntrinsicDimensions(FloatSize& intrinsicSize, FloatSize& intrinsicRatio);
|
|
|
| bool isAccessAllowed(SecurityOrigin*);
|
|
|