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/OverView.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/OverView.cpp')
| -rw-r--r-- | samplecode/OverView.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/samplecode/OverView.cpp b/samplecode/OverView.cpp index bbf647ae68..bdb8ddd657 100644 --- a/samplecode/OverView.cpp +++ b/samplecode/OverView.cpp @@ -48,8 +48,8 @@ public: virtual ~OverView(); protected: - bool onEvent(const SkEvent&) SK_OVERRIDE; - bool onQuery(SkEvent* evt) SK_OVERRIDE { + bool onEvent(const SkEvent&) override; + bool onQuery(SkEvent* evt) override { if (SampleCode::TitleQ(*evt)) { SampleCode::TitleR(evt, "Overview"); return true; @@ -66,13 +66,13 @@ protected: return this->INHERITED::onQuery(evt); } - void onDraw(SkCanvas* canvas) SK_OVERRIDE; + void onDraw(SkCanvas* canvas) override; - bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE { + bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) override { return false; } - Click* onFindClickHandler(SkScalar cx, SkScalar cy, unsigned modi) SK_OVERRIDE { + Click* onFindClickHandler(SkScalar cx, SkScalar cy, unsigned modi) override { const SkRect crect = SkRect::MakeXYWH(cx - 0.5f, cy - 0.5f, 1, 1); SkPoint loc = this->start(); for (int i = 0; i < fCount; ++i) { |