aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SamplePath.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-03-25 18:17:31 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-03-25 18:17:32 -0700
commit36352bf5e38f45a70ee4f4fc132a38048d38206d (patch)
tree24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /samplecode/SamplePath.cpp
parent02fd592c8d190058652bb715fb34feb7a72992e5 (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/SamplePath.cpp')
-rw-r--r--samplecode/SamplePath.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp
index b5edeb3ad3..4493d397d5 100644
--- a/samplecode/SamplePath.cpp
+++ b/samplecode/SamplePath.cpp
@@ -195,7 +195,7 @@ protected:
}
}
- bool onAnimate(const SkAnimTimer& timer) SK_OVERRIDE {
+ bool onAnimate(const SkAnimTimer& timer) override {
SkScalar currSecs = timer.scaled(100);
SkScalar delta = currSecs - fPrevSecs;
fPrevSecs = currSecs;
@@ -207,7 +207,7 @@ protected:
return true;
}
- SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
fShowHairline = !fShowHairline;
this->inval(NULL);
return this->INHERITED::onFindClickHandler(x, y, modi);
@@ -272,7 +272,7 @@ public:
protected:
// overrides from SkEventSink
- bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) override {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "ArcTo");
return true;
@@ -300,7 +300,7 @@ protected:
}
}
- void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) override {
canvas->drawPoints(SkCanvas::kPoints_PointMode, N, fPts, fPtsPaint);
SkPath path;
@@ -316,7 +316,7 @@ protected:
canvas->drawPath(path, fSkeletonPaint);
}
- bool onClick(Click* click) SK_OVERRIDE {
+ bool onClick(Click* click) override {
int32_t index;
if (click->fMeta.findS32("index", &index)) {
SkASSERT((unsigned)index < N);
@@ -327,7 +327,7 @@ protected:
return false;
}
- SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
+ SkView::Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override {
const SkScalar tol = 4;
const SkRect r = SkRect::MakeXYWH(x - tol, y - tol, tol * 2, tol * 2);
for (int i = 0; i < N; ++i) {