aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/fontcache.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/fontcache.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/fontcache.cpp')
-rw-r--r--gm/fontcache.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp
index 99554a2c32..3363e24ba3 100644
--- a/gm/fontcache.cpp
+++ b/gm/fontcache.cpp
@@ -47,15 +47,15 @@ public:
}
protected:
- virtual SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() SK_OVERRIDE {
return SkString("fontcache");
}
- virtual SkISize onISize() SK_OVERRIDE {
+ SkISize onISize() SK_OVERRIDE {
return SkISize::Make(1280, 640);
}
- virtual void onOnceBeforeDraw() SK_OVERRIDE {
+ void onOnceBeforeDraw() SK_OVERRIDE {
int typefaceCount = 0;
for (size_t i = 0; i < SK_ARRAY_COUNT(gFamilyNames); ++i) {
for (size_t j = 0; j < SK_ARRAY_COUNT(gStyles); ++j) {
@@ -65,7 +65,7 @@ protected:
}
}
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) SK_OVERRIDE {
SkScalar y = 32;
SkPaint paint;
paint.setAntiAlias(true);
@@ -88,7 +88,7 @@ protected:
}
- virtual uint32_t onGetFlags() const SK_OVERRIDE {
+ uint32_t onGetFlags() const SK_OVERRIDE {
// this GM is meant only for the GPU
return kGPUOnly_Flag;
}