Index: Source/core/rendering/RenderImageResource.h |
diff --git a/Source/core/rendering/RenderImageResource.h b/Source/core/rendering/RenderImageResource.h |
index 9d68c61fb77bb41ff81465aae5bb812d40cc53c3..ef2a4ae9dd6cd6b2d6a09b9f87925b175c84d06b 100644 |
--- a/Source/core/rendering/RenderImageResource.h |
+++ b/Source/core/rendering/RenderImageResource.h |
@@ -63,8 +63,8 @@ public: |
virtual bool imageHasRelativeWidth() const { return m_cachedImage ? m_cachedImage->imageHasRelativeWidth() : false; } |
virtual bool imageHasRelativeHeight() const { return m_cachedImage ? m_cachedImage->imageHasRelativeHeight() : false; } |
- virtual LayoutSize imageSize(float multiplier) const { return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier) : LayoutSize(); } |
- virtual LayoutSize intrinsicSize(float multiplier) const { return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier, ImageResource::IntrinsicSize) : LayoutSize(); } |
+ virtual LayoutSize imageSize(float multiplier) const { return getImageSize(multiplier, ImageResource::NormalSize); } |
+ virtual LayoutSize intrinsicSize(float multiplier) const { return getImageSize(multiplier, ImageResource::IntrinsicSize); } |
virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); } |
@@ -75,6 +75,7 @@ protected: |
private: |
static Image* nullImage(); |
+ LayoutSize getImageSize(float multiplier, ImageResource::SizeType) const; |
}; |
} // namespace WebCore |