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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderImage.h ('k') | Source/core/rendering/RenderInline.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org> 2 * Copyright (C) 1999 Lars Knoll <knoll@kde.org>
3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org> 3 * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>
4 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com> 4 * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
5 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> 5 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com> 7 * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 16 matching lines...) Expand all
27 #define RenderImageResourceStyleImage_h 27 #define RenderImageResourceStyleImage_h
28 28
29 #include "core/rendering/RenderImageResource.h" 29 #include "core/rendering/RenderImageResource.h"
30 #include "core/rendering/style/StyleImage.h" 30 #include "core/rendering/style/StyleImage.h"
31 #include "wtf/RefPtr.h" 31 #include "wtf/RefPtr.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 class RenderObject; 35 class RenderObject;
36 36
37 class RenderImageResourceStyleImage FINAL : public RenderImageResource { 37 class RenderImageResourceStyleImage final : public RenderImageResource {
38 public: 38 public:
39 virtual ~RenderImageResourceStyleImage(); 39 virtual ~RenderImageResourceStyleImage();
40 40
41 static PassOwnPtr<RenderImageResource> create(StyleImage* styleImage) 41 static PassOwnPtr<RenderImageResource> create(StyleImage* styleImage)
42 { 42 {
43 return adoptPtr(new RenderImageResourceStyleImage(styleImage)); 43 return adoptPtr(new RenderImageResourceStyleImage(styleImage));
44 } 44 }
45 virtual void initialize(RenderObject*) OVERRIDE; 45 virtual void initialize(RenderObject*) override;
46 virtual void shutdown() OVERRIDE; 46 virtual void shutdown() override;
47 47
48 virtual bool hasImage() const OVERRIDE { return true; } 48 virtual bool hasImage() const override { return true; }
49 virtual PassRefPtr<Image> image(int width = 0, int height = 0) const OVERRID E; 49 virtual PassRefPtr<Image> image(int width = 0, int height = 0) const overrid e;
50 virtual bool errorOccurred() const OVERRIDE { return m_styleImage->errorOccu rred(); } 50 virtual bool errorOccurred() const override { return m_styleImage->errorOccu rred(); }
51 51
52 virtual void setContainerSizeForRenderer(const IntSize&) OVERRIDE; 52 virtual void setContainerSizeForRenderer(const IntSize&) override;
53 virtual bool imageHasRelativeWidth() const OVERRIDE { return m_styleImage->i mageHasRelativeWidth(); } 53 virtual bool imageHasRelativeWidth() const override { return m_styleImage->i mageHasRelativeWidth(); }
54 virtual bool imageHasRelativeHeight() const OVERRIDE { return m_styleImage-> imageHasRelativeHeight(); } 54 virtual bool imageHasRelativeHeight() const override { return m_styleImage-> imageHasRelativeHeight(); }
55 55
56 virtual LayoutSize imageSize(float multiplier) const OVERRIDE { return m_sty leImage->imageSize(m_renderer, multiplier); } 56 virtual LayoutSize imageSize(float multiplier) const override { return m_sty leImage->imageSize(m_renderer, multiplier); }
57 virtual LayoutSize intrinsicSize(float multiplier) const OVERRIDE { return m _styleImage->imageSize(m_renderer, multiplier); } 57 virtual LayoutSize intrinsicSize(float multiplier) const override { return m _styleImage->imageSize(m_renderer, multiplier); }
58 58
59 virtual WrappedImagePtr imagePtr() const OVERRIDE { return m_styleImage->dat a(); } 59 virtual WrappedImagePtr imagePtr() const override { return m_styleImage->dat a(); }
60 60
61 private: 61 private:
62 RenderImageResourceStyleImage(StyleImage*); 62 RenderImageResourceStyleImage(StyleImage*);
63 RefPtr<StyleImage> m_styleImage; 63 RefPtr<StyleImage> m_styleImage;
64 }; 64 };
65 65
66 } // namespace blink 66 } // namespace blink
67 67
68 #endif // RenderImageStyleImage_h 68 #endif // RenderImageStyleImage_h
OLDNEW
« 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