summaryrefslogtreecommitdiffstats
path: root/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h
diff options
context:
space:
mode:
authortkent@chromium.org <tkent@chromium.org>2015-07-13 04:46:27 +0000
committertkent@chromium.org <tkent@chromium.org>2015-07-13 04:46:27 +0000
commit4eb0b693399a72ffae2c331199a3ee7a28f976e3 (patch)
tree6a571c260621d28977f02713d79524e2ed51ef9b /third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h
parent7acc2b7978d7d4e36ea723d86d01a799a04dc2c3 (diff)
downloadchromium_src-4eb0b693399a72ffae2c331199a3ee7a28f976e3.zip
chromium_src-4eb0b693399a72ffae2c331199a3ee7a28f976e3.tar.gz
chromium_src-4eb0b693399a72ffae2c331199a3ee7a28f976e3.tar.bz2
Fix virtual/override/final usage in Source/core/layout/.
- We should specify just one of them to a function. This was done by the following command. % sed -i "" -E "s/virtual (.*) final/\1 final/g; s/virtual (.*) override/\1 override/g; s/override final/final/g" <files> - Non-base virtual destructors should have |override| keywords. This CL has no behavior changes. BUG=417463 Review URL: https://codereview.chromium.org/1231363003 git-svn-id: svn://svn.chromium.org/blink/trunk@198748 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h')
-rw-r--r--third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h b/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h
index 8bcad1e..29b20cd 100644
--- a/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h
+++ b/third_party/WebKit/Source/core/layout/LayoutImageResourceStyleImage.h
@@ -36,27 +36,27 @@ class LayoutObject;
class LayoutImageResourceStyleImage final : public LayoutImageResource {
public:
- virtual ~LayoutImageResourceStyleImage();
+ ~LayoutImageResourceStyleImage() override;
static PassOwnPtr<LayoutImageResource> create(StyleImage* styleImage)
{
return adoptPtr(new LayoutImageResourceStyleImage(styleImage));
}
- virtual void initialize(LayoutObject*) override;
- virtual void shutdown() override;
+ void initialize(LayoutObject*) 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; }
+ PassRefPtr<Image> image(int width = 0, int height = 0) const override;
+ bool errorOccurred() const override { return m_styleImage->errorOccurred(); }
- virtual void setContainerSizeForLayoutObject(const IntSize&) override;
- virtual bool imageHasRelativeWidth() const override { return m_styleImage->imageHasRelativeWidth(); }
- virtual bool imageHasRelativeHeight() const override { return m_styleImage->imageHasRelativeHeight(); }
+ void setContainerSizeForLayoutObject(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_layoutObject, multiplier); }
- virtual LayoutSize intrinsicSize(float multiplier) const override { return m_styleImage->imageSize(m_layoutObject, multiplier); }
+ LayoutSize imageSize(float multiplier) const override { return m_styleImage->imageSize(m_layoutObject, multiplier); }
+ LayoutSize intrinsicSize(float multiplier) const override { return m_styleImage->imageSize(m_layoutObject, multiplier); }
- virtual WrappedImagePtr imagePtr() const override { return m_styleImage->data(); }
+ WrappedImagePtr imagePtr() const override { return m_styleImage->data(); }
private:
LayoutImageResourceStyleImage(StyleImage*);