aboutsummaryrefslogtreecommitdiff
path: root/samplecode/SamplePictFile.cpp
diff options
context:
space:
mode:
authormtklein <mtklein@chromium.org>2015-01-09 10:06:39 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-09 10:06:40 -0800
commit72c9faab45124e08c85f70ca38536914862d947c (patch)
tree611893b84bb33b1592d058ee0f2382f7f86601b8 /samplecode/SamplePictFile.cpp
parent4490da227f1475fb66af20532c14d6d9febd18b6 (diff)
Fix up all the easy virtual ... SK_OVERRIDE cases.
This fixes every case where virtual and SK_OVERRIDE were on the same line, which should be the bulk of cases. We'll have to manually clean up the rest over time unless I level up in regexes. for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end BUG=skia: Review URL: https://codereview.chromium.org/806653007
Diffstat (limited to 'samplecode/SamplePictFile.cpp')
-rw-r--r--samplecode/SamplePictFile.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SamplePictFile.cpp b/samplecode/SamplePictFile.cpp
index bcbad9966c..3fb335fc34 100644
--- a/samplecode/SamplePictFile.cpp
+++ b/samplecode/SamplePictFile.cpp
@@ -47,7 +47,7 @@ public:
}
}
- virtual void onTileSizeChanged(const SkSize &tileSize) SK_OVERRIDE {
+ void onTileSizeChanged(const SkSize &tileSize) SK_OVERRIDE {
if (tileSize != fTileSize) {
fTileSize = tileSize;
}
@@ -55,7 +55,7 @@ public:
protected:
// overrides from SkEventSink
- virtual bool onQuery(SkEvent* evt) SK_OVERRIDE {
+ bool onQuery(SkEvent* evt) SK_OVERRIDE {
if (SampleCode::TitleQ(*evt)) {
SkString name("P:");
const char* basename = strrchr(fFilename.c_str(), SkPATH_SEPARATOR);
@@ -77,7 +77,7 @@ protected:
return this->INHERITED::onQuery(evt);
}
- virtual bool onEvent(const SkEvent& evt) SK_OVERRIDE {
+ bool onEvent(const SkEvent& evt) SK_OVERRIDE {
if (evt.isType("PictFileView::toggleBBox")) {
fBBox = (BBoxType)((fBBox + 1) % kBBoxTypeCount);
return true;
@@ -85,7 +85,7 @@ protected:
return this->INHERITED::onEvent(evt);
}
- virtual void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
+ void onDrawContent(SkCanvas* canvas) SK_OVERRIDE {
SkASSERT(static_cast<int>(fBBox) < kBBoxTypeCount);
SkPicture** picture = fPictures + fBBox;