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/SampleText.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/SampleText.cpp')
| -rw-r--r-- | samplecode/SampleText.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp index 112573e967..aae42c1694 100644 --- a/samplecode/SampleText.cpp +++ b/samplecode/SampleText.cpp @@ -115,7 +115,7 @@ public: protected: // overrides from SkEventSink - bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Text"); return true; @@ -143,7 +143,7 @@ protected: pts[i].set(rand->nextUScalar1() * 640, rand->nextUScalar1() * 480); } - void onDrawContent(SkCanvas* canvas) SK_OVERRIDE { + void onDrawContent(SkCanvas* canvas) override { SkAutoCanvasRestore restore(canvas, false); { SkRect r; @@ -186,13 +186,13 @@ protected: } virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, - unsigned modi) SK_OVERRIDE { + unsigned modi) override { fClickX = x; 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); } |