From 5e2bc6953fe6923165b8a5d7679939693a1d58d6 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 5 Feb 2010 14:27:46 +0000 Subject: Merge webkit.org at r54340 : Initial merge by git Change-Id: Ib489d2ff91186ea3652522e1d586e54416a2cf44 --- WebCore/rendering/RenderImage.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'WebCore/rendering/RenderImage.h') diff --git a/WebCore/rendering/RenderImage.h b/WebCore/rendering/RenderImage.h index bc5e2d8..b89a652 100644 --- a/WebCore/rendering/RenderImage.h +++ b/WebCore/rendering/RenderImage.h @@ -64,6 +64,8 @@ protected: bool isWidthSpecified() const; bool isHeightSpecified() const; + virtual void intrinsicSizeChanged() { imageChanged(imagePtr()); } + private: virtual const char* renderName() const { return "RenderImage"; } @@ -89,8 +91,6 @@ private: virtual IntSize imageSize(float multiplier) const { return m_cachedImage ? m_cachedImage->imageSize(multiplier) : IntSize(); } virtual WrappedImagePtr imagePtr() const { return m_cachedImage.get(); } - virtual void intrinsicSizeChanged() { imageChanged(imagePtr()); } - int calcAspectRatioWidth() const; int calcAspectRatioHeight() const; -- cgit v1.1