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/SampleBitmapRect.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/SampleBitmapRect.cpp')
| -rw-r--r-- | samplecode/SampleBitmapRect.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp index 3c700eca66..123bfb8b12 100644 --- a/samplecode/SampleBitmapRect.cpp +++ b/samplecode/SampleBitmapRect.cpp @@ -103,7 +103,7 @@ public: } protected: - bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "BitmapRect"); return true; @@ -111,7 +111,7 @@ protected: return this->INHERITED::onQuery(evt); } - void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) override { SkRect srcR; srcR.set(fSrcPts[0], fSrcPts[1]); srcR = SkRect::MakeXYWH(fSrcPts[0].fX, fSrcPts[0].fY, 32, 32); @@ -136,7 +136,7 @@ protected: } } - bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE { + bool onAnimate(const SkAnimTimer& timer) override { if (timer.isStopped()) { this->resetBounce(); } else if (timer.isRunning()) { @@ -210,7 +210,7 @@ public: } protected: - bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "BigBitmapRect"); return true; @@ -218,7 +218,7 @@ protected: return this->INHERITED::onQuery(evt); } - void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) override { SkPaint paint; paint.setStyle(SkPaint::kStroke_Style); paint.setColor(SK_ColorYELLOW); @@ -230,7 +230,7 @@ protected: } } - bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE { + bool onAnimate(const SkAnimTimer& timer) override { if (timer.isStopped()) { this->resetBounce(); } else if (timer.isRunning()) { |