diff options
| author |  mtklein <mtklein@chromium.org> | 2015-01-09 10:06:39 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-09 10:06:40 -0800 |
| commit | 72c9faab45124e08c85f70ca38536914862d947c (patch) | |
| tree | 611893b84bb33b1592d058ee0f2382f7f86601b8 /gm/xfermodes2.cpp | |
| parent | 4490da227f1475fb66af20532c14d6d9febd18b6 (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 'gm/xfermodes2.cpp')
| -rw-r--r-- | gm/xfermodes2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index b1dd6d8fc0..98e6f3a85c 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -18,15 +18,15 @@ public: Xfermodes2GM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("xfermodes2"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(455, 475); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { canvas->translate(SkIntToScalar(10), SkIntToScalar(20)); const SkScalar w = SkIntToScalar(kSize); @@ -86,7 +86,7 @@ protected: } private: - virtual void onOnceBeforeDraw() SK_OVERRIDE { + void onOnceBeforeDraw() SK_OVERRIDE { static const uint32_t kCheckData[] = { SkPackARGB32(0xFF, 0x40, 0x40, 0x40), SkPackARGB32(0xFF, 0xD0, 0xD0, 0xD0), |