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

Unified Diff: gm/surface.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/stroketext.cpp ('k') | gm/tallstretchedbitmaps.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/surface.cpp
diff --git a/gm/surface.cpp b/gm/surface.cpp
index 5a4c09a54dcc8b01aac7ab8526072220f4c2317c..913de994e4f016792ba06a65c25eb8a7dbb083ee 100644
--- a/gm/surface.cpp
+++ b/gm/surface.cpp
@@ -61,15 +61,15 @@ public:
SurfacePropsGM() {}
protected:
- SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() override {
return SkString("surfaceprops");
}
- SkISize onISize() SK_OVERRIDE {
+ SkISize onISize() override {
return SkISize::Make(W * 4, H * 5);
}
- void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) override {
GrContext* ctx = canvas->getGrContext();
// must be opaque to have a hope of testing LCD text
@@ -118,11 +118,11 @@ public:
NewSurfaceGM() {}
protected:
- SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() override {
return SkString("surfacenew");
}
- SkISize onISize() SK_OVERRIDE {
+ SkISize onISize() override {
return SkISize::Make(300, 140);
}
@@ -130,7 +130,7 @@ protected:
canvas->drawColor(SK_ColorRED);
}
- void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) override {
SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
SkAutoTUnref<SkSurface> surf(canvas->newSurface(info, NULL));
« no previous file with comments | « gm/stroketext.cpp ('k') | gm/tallstretchedbitmaps.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698