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/xfermodes.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/xfermodes.cpp')
-rw-r--r-- | gm/xfermodes.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp index 82d1cef478..066ad5b695 100644 --- a/gm/xfermodes.cpp +++ b/gm/xfermodes.cpp @@ -154,7 +154,7 @@ class XfermodesGM : public GM { } } - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { fBG.installPixels(SkImageInfo::Make(2, 2, kARGB_4444_SkColorType, kOpaque_SkAlphaType), gData, 4); @@ -168,15 +168,15 @@ public: XfermodesGM() {} protected: - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("xfermodes"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(1990, 640); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { canvas->translate(SkIntToScalar(10), SkIntToScalar(20)); const struct { |