webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 3 insertions, 14 deletions

diff --git a/Source/WebCore/rendering/RenderImageResource.cpp b/Source/WebCore/rendering/RenderImageResource.cpp
index 45115a6fa..e6a1dc459 100644
--- a/Source/WebCore/rendering/RenderImageResource.cpp
+++ b/Source/WebCore/rendering/RenderImageResource.cpp
@@ -31,7 +31,6 @@
 #include "CachedImage.h"
 #include "Image.h"
 #include "RenderElement.h"
-#include "RenderImage.h"
 #include "RenderImageResourceStyleImage.h"
 
 namespace WebCore {
@@ -90,7 +89,7 @@ void RenderImageResource::resetAnimation()
         m_renderer->repaint();
 }
 
-RefPtr<Image> RenderImageResource::image(int, int) const
+PassRefPtr<Image> RenderImageResource::image(int, int) const
 {
     return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : Image::nullImage();
 }
@@ -119,22 +118,12 @@ bool RenderImageResource::imageHasRelativeHeight() const
 
 LayoutSize RenderImageResource::imageSize(float multiplier) const
 {
-    return getImageSize(multiplier, CachedImage::UsedSize);
+    return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier) : LayoutSize();
 }
 
 LayoutSize RenderImageResource::intrinsicSize(float multiplier) const
 {
-    return getImageSize(multiplier, CachedImage::IntrinsicSize);
-}
-
-LayoutSize RenderImageResource::getImageSize(float multiplier, CachedImage::SizeType type) const
-{
-    if (!m_cachedImage)
-        return LayoutSize();
-    LayoutSize size = m_cachedImage->imageSizeForRenderer(m_renderer, multiplier, type);
-    if (is<RenderImage>(m_renderer))
-        size.scale(downcast<RenderImage>(*m_renderer).imageDevicePixelRatio());
-    return size;
+    return m_cachedImage ? m_cachedImage->imageSizeForRenderer(m_renderer, multiplier, CachedImage::IntrinsicSize) : LayoutSize();
 }
 
 } // namespace WebCore