diff options
| author | droger <droger@chromium.org> | 2015-01-20 12:55:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-20 20:56:48 +0000 |
| commit | b4a495753c1c291ca0209c2765e6562a723c5959 (patch) | |
| tree | df348a53239913c631f33432339e8597efdfe7ed /ui/gfx/image | |
| parent | 4a193b718a4a09e74ed11f6642e32b55e9e0e955 (diff) | |
| download | chromium_src-b4a495753c1c291ca0209c2765e6562a723c5959.zip chromium_src-b4a495753c1c291ca0209c2765e6562a723c5959.tar.gz chromium_src-b4a495753c1c291ca0209c2765e6562a723c5959.tar.bz2 | |
Enable strict-virtual-specifiers for iOS builds.
This CL cleans up the remaining errors and enables the compile
time check in common.gypi.
BUG=417463
Review URL: https://codereview.chromium.org/840813009
Cr-Commit-Position: refs/heads/master@{#312269}
Diffstat (limited to 'ui/gfx/image')
| -rw-r--r-- | ui/gfx/image/image.cc | 14 | ||||
| -rw-r--r-- | ui/gfx/image/image_ios_unittest.mm | 6 |
2 files changed, 7 insertions, 13 deletions
diff --git a/ui/gfx/image/image.cc b/ui/gfx/image/image.cc index 46c1a44..170c514 100644 --- a/ui/gfx/image/image.cc +++ b/ui/gfx/image/image.cc @@ -288,22 +288,16 @@ class ImageRepCocoaTouch : public ImageRep { CHECK(image); } - virtual ~ImageRepCocoaTouch() { + ~ImageRepCocoaTouch() override { base::mac::NSObjectRelease(image_); image_ = nil; } - virtual int Width() const override { - return Size().width(); - } + int Width() const override { return Size().width(); } - virtual int Height() const override { - return Size().height(); - } + int Height() const override { return Size().height(); } - virtual gfx::Size Size() const override { - return internal::UIImageSize(image_); - } + gfx::Size Size() const override { return internal::UIImageSize(image_); } UIImage* image() const { return image_; } diff --git a/ui/gfx/image/image_ios_unittest.mm b/ui/gfx/image/image_ios_unittest.mm index 789fe72..a9558b0 100644 --- a/ui/gfx/image/image_ios_unittest.mm +++ b/ui/gfx/image/image_ios_unittest.mm @@ -46,13 +46,13 @@ UIImage* UIImageWithSizeAndScale(CGFloat width, CGFloat height, CGFloat scale) { class ImageIOSTest : public testing::Test { public: ImageIOSTest() {} - virtual ~ImageIOSTest() {} + ~ImageIOSTest() override {} - virtual void SetUp() override { + void SetUp() override { original_scale_factors_ = gfx::ImageSkia::GetSupportedScales(); } - virtual void TearDown() override { + void TearDown() override { gfx::ImageSkia::SetSupportedScales(original_scale_factors_); } |