diff options
author | 2015-03-25 18:17:31 -0700 | |
---|---|---|
committer | 2015-03-25 18:17:32 -0700 | |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /gm/coloremoji.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/coloremoji.cpp')
-rw-r--r-- | gm/coloremoji.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index 8276ea8974..5a2703b4af 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -53,7 +53,7 @@ protected: SkTypeface* typeface; const char* text; } emojiFonts[2]; - virtual void onOnceBeforeDraw() SK_OVERRIDE { + virtual void onOnceBeforeDraw() override { SkString filename = GetResourcePath("/Funkster.ttf"); SkAutoTDelete<SkFILEStream> stream(new SkFILEStream(filename.c_str())); if (stream->isValid()) { @@ -74,15 +74,15 @@ protected: "\xF0\x9F\x87\xBA" "\xF0\x9F\x87\xB8" "\xF0\x9F\x87\xA6"; // πΊπΈπ¦ } - SkString onShortName() SK_OVERRIDE { + SkString onShortName() override { return SkString("coloremoji"); } - SkISize onISize() SK_OVERRIDE { + SkISize onISize() override { return SkISize::Make(650, 900); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) override { canvas->drawColor(SK_ColorGRAY); |