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/multipicturedraw.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/multipicturedraw.cpp')
-rw-r--r-- | gm/multipicturedraw.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index 97a5ffcdba..0625b5a35b 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -486,14 +486,14 @@ namespace skiagm { Layout fLayout; const SkPicture* fPictures[kNumPictures]; - void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() override { fPictures[0] = make_hex_plane_picture(SK_ColorWHITE); fPictures[1] = make_hex_plane_picture(SK_ColorGRAY); fPictures[2] = make_sierpinski_picture(); fPictures[3] = make_single_layer_hex_plane_picture(); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { SkMultiPictureDraw mpd; SkTArray<ComposeStep> composeSteps; @@ -514,9 +514,9 @@ namespace skiagm { } } - SkISize onISize() SK_OVERRIDE { return SkISize::Make(kPicWidth, kPicHeight); } + SkISize onISize() override { return SkISize::Make(kPicWidth, kPicHeight); } - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { static const char* gContentNames[] = { "noclip", "rectclip", "rrectclip", "pathclip", "invpathclip", "sierpinski", "biglayer" @@ -534,7 +534,7 @@ namespace skiagm { return name; } - bool runAsBench() const SK_OVERRIDE { return true; } + bool runAsBench() const override { return true; } private: typedef GM INHERITED; |