Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(920)

Unified Diff: samplecode/OverView.cpp

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « samplecode/GMSampleView.h ('k') | samplecode/SampleAll.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: samplecode/OverView.cpp
diff --git a/samplecode/OverView.cpp b/samplecode/OverView.cpp
index fec7fb39fbad0db5513133e04dcf17ec47160f53..5346c1a18cedd54ba34b586067022ada0c6d0067 100644
--- a/samplecode/OverView.cpp
+++ b/samplecode/OverView.cpp
@@ -24,8 +24,8 @@ public:
protected:
// Overridden from SkEventSink:
- virtual bool onEvent(const SkEvent&) SK_OVERRIDE;
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onEvent(const SkEvent&) SK_OVERRIDE;
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SampleCode::TitleR(evt, "Overview");
return true;
@@ -38,18 +38,18 @@ protected:
// Overridden from SkView:
- virtual void onSizeChange() SK_OVERRIDE;
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onSizeChange() SK_OVERRIDE;
+ void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->drawColor(SK_ColorLTGRAY);
}
- virtual SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE;
+ SkCanvas* beforeChildren(SkCanvas*) SK_OVERRIDE;
- virtual bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
+ bool onSendClickToChildren(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
return false;
}
- virtual Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
+ Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE {
int ix = (int)(SkScalarDiv(x * N, kWidth));
int iy = (int)(SkScalarDiv(y * N, kHeight));
if (ix >= 0 && iy >= 0) {
« no previous file with comments | « samplecode/GMSampleView.h ('k') | samplecode/SampleAll.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698