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/composeshader.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/composeshader.cpp')
-rw-r--r-- | gm/composeshader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index c9c8fe45a9..76ff8edfc4 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -49,15 +49,15 @@ public: } protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("composeshader"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(120, 120); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkPaint paint; @@ -79,15 +79,15 @@ public: ComposeShaderAlphaGM() {} protected: - virtual SkString onShortName() SK_OVERRIDE { + SkString onShortName() SK_OVERRIDE { return SkString("composeshader_alpha"); } - virtual SkISize onISize() SK_OVERRIDE { + SkISize onISize() SK_OVERRIDE { return SkISize::Make(220, 750); } - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { + void onDraw(SkCanvas* canvas) SK_OVERRIDE { SkAutoTUnref<SkShader> shader0(make_shader(SkXfermode::kDstIn_Mode)); SkAutoTUnref<SkShader> shader1(make_shader(SkXfermode::kSrcOver_Mode)); SkShader* shaders[] = { shader0.get(), shader1.get() }; |