Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: gm/coloremoji.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/cmykjpeg.cpp ('k') | gm/colorfilters.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/coloremoji.cpp
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp
index 8276ea8974ecd42464e52811689884ec6c07a0dc..5a2703b4afd9040a5003f58d966b53a0b74f6387 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);
« no previous file with comments | « gm/cmykjpeg.cpp ('k') | gm/colorfilters.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698