aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/variedtext.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/variedtext.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/variedtext.cpp')
-rw-r--r--gm/variedtext.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp
index ebb3c3be5b..dddd79e942 100644
--- a/gm/variedtext.cpp
+++ b/gm/variedtext.cpp
@@ -31,7 +31,7 @@ public:
}
protected:
- virtual SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() SK_OVERRIDE {
SkString name("varied_text");
if (fEffectiveClip) {
name.append("_clipped");
@@ -46,11 +46,11 @@ protected:
return name;
}
- virtual SkISize onISize() SK_OVERRIDE {
+ SkISize onISize() SK_OVERRIDE {
return SkISize::Make(640, 480);
}
- virtual void onOnceBeforeDraw() SK_OVERRIDE {
+ void onOnceBeforeDraw() SK_OVERRIDE {
fPaint.setAntiAlias(true);
fPaint.setLCDRenderText(fLCD);
@@ -111,7 +111,7 @@ protected:
}
}
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) SK_OVERRIDE {
for (int i = 0; i < kCnt; ++i) {
fPaint.setColor(fColors[i]);
fPaint.setTextSize(fPtSizes[i]);
@@ -136,7 +136,7 @@ protected:
}
}
- virtual uint32_t onGetFlags() const SK_OVERRIDE {
+ uint32_t onGetFlags() const SK_OVERRIDE {
// The aa hairline stroked rects used to visualize the clip draw slightly differently in
// quilt mode in dm.
return kAsBench_Flag | kSkipTiled_Flag;