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

Unified Diff: samplecode/SamplePictFile.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/SamplePathFuzz.cpp ('k') | samplecode/SamplePicture.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/SamplePictFile.cpp
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp
index 8f827e10aa248138ad7a2b4409a64e9504e23815..a0bab7da4ebd016f45097dd645a729bc4f1325ec 100644
--- a/samplecode/SamplePictFile.cpp
+++ b/samplecode/SamplePictFile.cpp
@@ -49,7 +49,7 @@ public:
}
}
- void onTileSizeChanged(const SkSize &tileSize) SK_OVERRIDE {
+ void onTileSizeChanged(const SkSize &tileSize) override {
if (tileSize != fTileSize) {
fTileSize = tileSize;
}
@@ -57,7 +57,7 @@ public:
protected:
// overrides from SkEventSink
- bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) override {
if (SampleCode::TitleQ(*evt)) {
SkString name("P:");
const char* basename = strrchr(fFilename.c_str(), SkPATH_SEPARATOR);
@@ -79,7 +79,7 @@ protected:
return this->INHERITED::onQuery(evt);
}
- bool onEvent(const SkEvent& evt) SK_OVERRIDE {
+ bool onEvent(const SkEvent& evt) override {
if (evt.isType("PictFileView::toggleBBox")) {
fBBox = (BBoxType)((fBBox + 1) % kBBoxTypeCount);
return true;
@@ -87,7 +87,7 @@ protected:
return this->INHERITED::onEvent(evt);
}
- void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) override {
SkASSERT(static_cast<int>(fBBox) < kBBoxTypeCount);
SkPicture** picture = fPictures + fBBox;
« no previous file with comments | « samplecode/SamplePathFuzz.cpp ('k') | samplecode/SamplePicture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698