aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/dftext.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/dftext.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/dftext.cpp')
-rwxr-xr-xgm/dftext.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index d501e58673..36b8d5501c 100755
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -23,7 +23,7 @@ public:
}
protected:
- virtual void onOnceBeforeDraw() SK_OVERRIDE {
+ void onOnceBeforeDraw() SK_OVERRIDE {
SkString filename = GetResourcePath("/Funkster.ttf");
SkAutoTUnref<SkFILEStream> stream(new SkFILEStream(filename.c_str()));
if (!stream->isValid()) {
@@ -34,15 +34,15 @@ protected:
fTypeface = SkTypeface::CreateFromStream(stream);
}
- virtual uint32_t onGetFlags() const SK_OVERRIDE {
+ uint32_t onGetFlags() const SK_OVERRIDE {
return kGPUOnly_Flag;
}
- virtual SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() SK_OVERRIDE {
return SkString("dftext");
}
- virtual SkISize onISize() SK_OVERRIDE {
+ SkISize onISize() SK_OVERRIDE {
return SkISize::Make(1024, 768);
}