webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 12 insertions, 15 deletions

diff --git a/Source/WebCore/rendering/RenderImageResourceStyleImage.h b/Source/WebCore/rendering/RenderImageResourceStyleImage.h
index e55509308..584055ce2 100644
--- a/Source/WebCore/rendering/RenderImageResourceStyleImage.h
+++ b/Source/WebCore/rendering/RenderImageResourceStyleImage.h
@@ -23,8 +23,7 @@
  *
  */
 
-#ifndef RenderImageResourceStyleImage_h
-#define RenderImageResourceStyleImage_h
+#pragma once
 
 #include "RenderImageResource.h"
 #include "StyleImage.h"
@@ -40,25 +39,23 @@ public:
     virtual ~RenderImageResourceStyleImage();
 
 private:
-    virtual void initialize(RenderElement*) override;
-    virtual void shutdown() override;
+    void initialize(RenderElement*) override;
+    void shutdown() override;
 
-    virtual bool hasImage() const override { return true; }
-    virtual PassRefPtr<Image> image(int width = 0, int height = 0) const override;
-    virtual bool errorOccurred() const override { return m_styleImage->errorOccurred(); }
+    bool hasImage() const override { return true; }
+    RefPtr<Image> image(const IntSize& = { }) const override;
+    bool errorOccurred() const override { return m_styleImage->errorOccurred(); }
 
-    virtual void setContainerSizeForRenderer(const IntSize&) override;
-    virtual bool imageHasRelativeWidth() const override { return m_styleImage->imageHasRelativeWidth(); }
-    virtual bool imageHasRelativeHeight() const override { return m_styleImage->imageHasRelativeHeight(); }
+    void setContainerSizeForRenderer(const IntSize&) override;
+    bool imageHasRelativeWidth() const override { return m_styleImage->imageHasRelativeWidth(); }
+    bool imageHasRelativeHeight() const override { return m_styleImage->imageHasRelativeHeight(); }
 
-    virtual LayoutSize imageSize(float multiplier) const override { return m_styleImage->imageSize(m_renderer, multiplier); }
-    virtual LayoutSize intrinsicSize(float multiplier) const override { return m_styleImage->imageSize(m_renderer, multiplier); }
+    LayoutSize imageSize(float multiplier) const override { return LayoutSize(m_styleImage->imageSize(m_renderer, multiplier)); }
+    LayoutSize intrinsicSize(float multiplier) const override { return LayoutSize(m_styleImage->imageSize(m_renderer, multiplier)); }
 
-    virtual WrappedImagePtr imagePtr() const override { return m_styleImage->data(); }
+    WrappedImagePtr imagePtr() const override { return m_styleImage->data(); }
 
     Ref<StyleImage> m_styleImage;
 };
 
 } // namespace WebCore
-
-#endif // RenderImageStyleImage_h