aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/tilemodes_scaled.cpp
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-01-09 10:06:39 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-01-09 10:06:40 -0800
commit72c9faab45124e08c85f70ca38536914862d947c (patch)
tree611893b84bb33b1592d058ee0f2382f7f86601b8 /gm/tilemodes_scaled.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 'gm/tilemodes_scaled.cpp')
-rw-r--r--gm/tilemodes_scaled.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp
index 32f640acaa..4edd11586f 100644
--- a/gm/tilemodes_scaled.cpp
+++ b/gm/tilemodes_scaled.cpp
@@ -75,21 +75,21 @@ protected:
#ifdef SK_CPU_ARM64
// Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed.
- virtual uint32_t onGetFlags() const SK_OVERRIDE {
+ uint32_t onGetFlags() const SK_OVERRIDE {
return kSkipTiled_Flag;
}
#endif
SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 760); }
- virtual void onOnceBeforeDraw() SK_OVERRIDE {
+ void onOnceBeforeDraw() SK_OVERRIDE {
int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
for (size_t i = 0; i < SK_ARRAY_COUNT(gColorTypes); i++) {
makebm(&fTexture[i], gColorTypes[i], size, size);
}
}
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) SK_OVERRIDE {
float scale = 32.f/kPOTSize;
int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
@@ -213,7 +213,7 @@ public:
}
protected:
- virtual uint32_t onGetFlags() const SK_OVERRIDE {
+ uint32_t onGetFlags() const SK_OVERRIDE {
return kSkipTiled_Flag;
}
@@ -223,7 +223,7 @@ protected:
SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); }
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) SK_OVERRIDE {
canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2);
const SkScalar w = SkIntToScalar(gWidth);