| 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;
|
|
|
|
|