Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Unified Diff: Source/core/rendering/RenderImageResourceStyleImage.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/rendering/RenderImage.h ('k') | Source/core/rendering/RenderInline.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderImageResourceStyleImage.h
diff --git a/Source/core/rendering/RenderImageResourceStyleImage.h b/Source/core/rendering/RenderImageResourceStyleImage.h
index c77e46dd0443c98e6f9012efbac757d8a0f70421..2cb81f8236375338b98debeca53e09c6206208d4 100644
--- a/Source/core/rendering/RenderImageResourceStyleImage.h
+++ b/Source/core/rendering/RenderImageResourceStyleImage.h
@@ -34,7 +34,7 @@ namespace blink {
class RenderObject;
-class RenderImageResourceStyleImage FINAL : public RenderImageResource {
+class RenderImageResourceStyleImage final : public RenderImageResource {
public:
virtual ~RenderImageResourceStyleImage();
@@ -42,21 +42,21 @@ public:
{
return adoptPtr(new RenderImageResourceStyleImage(styleImage));
}
- virtual void initialize(RenderObject*) OVERRIDE;
- virtual void shutdown() OVERRIDE;
+ virtual void initialize(RenderObject*) override;
+ virtual 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(); }
+ 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(); }
- virtual void setContainerSizeForRenderer(const IntSize&) OVERRIDE;
- virtual bool imageHasRelativeWidth() const OVERRIDE { return m_styleImage->imageHasRelativeWidth(); }
- virtual bool imageHasRelativeHeight() const OVERRIDE { return m_styleImage->imageHasRelativeHeight(); }
+ virtual void setContainerSizeForRenderer(const IntSize&) override;
+ virtual bool imageHasRelativeWidth() const override { return m_styleImage->imageHasRelativeWidth(); }
+ virtual 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); }
+ 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); }
- virtual WrappedImagePtr imagePtr() const OVERRIDE { return m_styleImage->data(); }
+ virtual WrappedImagePtr imagePtr() const override { return m_styleImage->data(); }
private:
RenderImageResourceStyleImage(StyleImage*);
« no previous file with comments | « Source/core/rendering/RenderImage.h ('k') | Source/core/rendering/RenderInline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698