webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 6 insertions, 6 deletions

diff --git a/Source/WebCore/rendering/RenderImageResource.h b/Source/WebCore/rendering/RenderImageResource.h
index 0044f06a0..8c6f81907 100644
--- a/Source/WebCore/rendering/RenderImageResource.h
+++ b/Source/WebCore/rendering/RenderImageResource.h
@@ -23,12 +23,11 @@
  *
  */
 
-#ifndef RenderImageResource_h
-#define RenderImageResource_h
+#pragma once
 
+#include "CachedImage.h"
 #include "CachedResourceHandle.h"
 #include "StyleImage.h"
-#include <wtf/PassOwnPtr.h>
 
 namespace WebCore {
 
@@ -50,7 +49,7 @@ public:
 
     void resetAnimation();
 
-    virtual PassRefPtr<Image> image(int width = 0, int height = 0) const;
+    virtual RefPtr<Image> image(const IntSize& size = { }) const;
     virtual bool errorOccurred() const;
 
     virtual void setContainerSizeForRenderer(const IntSize&);
@@ -65,8 +64,9 @@ public:
 protected:
     RenderElement* m_renderer;
     CachedResourceHandle<CachedImage> m_cachedImage;
+
+private:
+    LayoutSize getImageSize(float multiplier, CachedImage::SizeType) const;
 };
 
 } // namespace WebCore
-
-#endif // RenderImage_h