diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
| commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
| tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /gm/blurrect.cpp | |
| parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) | |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'gm/blurrect.cpp')
| -rw-r--r-- | gm/blurrect.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp index fb3ee37903..e6c6911380 100644 --- a/gm/blurrect.cpp +++ b/gm/blurrect.cpp @@ -93,7 +93,7 @@ public: } protected: - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { for (int i = 0; i <= kLastEnum_SkBlurStyle; ++i) { fMaskFilters[i].reset(SkBlurMaskFilter::Create((SkBlurStyle)i, SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(STROKE_WIDTH/2)), @@ -101,15 +101,15 @@ protected: } } - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return fName; } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(860, 820); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { canvas->translate(STROKE_WIDTH*3/2, STROKE_WIDTH*3/2); SkRect r = { 0, 0, 100, 50 }; @@ -329,7 +329,7 @@ public: } protected: - bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE { + bool makeMask(SkMask *m, const SkRect& r) override { return SkBlurMask::BlurRect(SkBlurMask::ConvertRadiusToSigma(this->radius()), m, r, this->style()); } @@ -345,7 +345,7 @@ public: } protected: - bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE { + bool makeMask(SkMask *m, const SkRect& r) override { SkMask src; r.roundOut(&src.fBounds); src.fBounds.offset(-src.fBounds.fLeft, -src.fBounds.fTop); // move to origin @@ -376,7 +376,7 @@ public: } protected: - SkBlurQuality getQuality() SK_OVERRIDE { + SkBlurQuality getQuality() override { return kLow_SkBlurQuality; } private: @@ -391,7 +391,7 @@ public: } protected: - bool makeMask(SkMask *m, const SkRect& r) SK_OVERRIDE { + bool makeMask(SkMask *m, const SkRect& r) override { SkMask src; r.roundOut(&src.fBounds); src.fBounds.offset(-src.fBounds.fLeft, -src.fBounds.fTop); // move to origin |