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

Unified Diff: samplecode/SampleShaders.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 | « samplecode/SampleRepeatTile.cpp ('k') | samplecode/SampleSlides.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SampleShaders.cpp
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index 5a358c6af9ce728191ccc864bac1b5cc02da58b5..093e14f4ebeb00815a5535d88eb4af0d9c19f778 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -83,7 +83,7 @@ public:
protected:
// overrides from SkEventSink
- bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) override {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Shaders");
return true;
@@ -91,7 +91,7 @@ protected:
return this->INHERITED::onQuery(evt);
}
- void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) override {
canvas->drawBitmap(fBitmap, 0, 0);
canvas->translate(SkIntToScalar(20), SkIntToScalar(120));
@@ -122,12 +122,12 @@ protected:
}
virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y,
- unsigned modi) SK_OVERRIDE {
+ unsigned modi) override {
this->inval(NULL);
return this->INHERITED::onFindClickHandler(x, y, modi);
}
- bool onClick(Click* click) SK_OVERRIDE {
+ bool onClick(Click* click) override {
return this->INHERITED::onClick(click);
}
« no previous file with comments | « samplecode/SampleRepeatTile.cpp ('k') | samplecode/SampleSlides.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698