diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
| commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
| tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /samplecode/SamplePictFile.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 'samplecode/SamplePictFile.cpp')
| -rw-r--r-- | samplecode/SamplePictFile.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp index 8f827e10aa..a0bab7da4e 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; |