aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/polygons.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/polygons.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/polygons.cpp')
-rw-r--r--gm/polygons.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/gm/polygons.cpp b/gm/polygons.cpp
index 1d639780fd..e8d85040d2 100644
--- a/gm/polygons.cpp
+++ b/gm/polygons.cpp
@@ -22,22 +22,22 @@ public:
PolygonsGM() {}
protected:
- virtual uint32_t onGetFlags() const SK_OVERRIDE {
+ uint32_t onGetFlags() const SK_OVERRIDE {
return kSkipTiled_Flag;
}
- virtual SkString onShortName() SK_OVERRIDE {
+ SkString onShortName() SK_OVERRIDE {
return SkString("polygons");
}
- virtual SkISize onISize() SK_OVERRIDE {
+ SkISize onISize() SK_OVERRIDE {
int width = kNumPolygons * kCellSize + 40;
int height = (kNumJoins * kNumStrokeWidths + kNumExtraStyles) * kCellSize + 40;
return SkISize::Make(width, height);
}
// Construct all polygons
- virtual void onOnceBeforeDraw() SK_OVERRIDE {
+ void onOnceBeforeDraw() SK_OVERRIDE {
SkPoint p0[] = {{0, 0}, {60, 0}, {90, 40}}; // triangle
SkPoint p1[] = {{0, 0}, {0, 40}, {60, 40}, {40, 0}}; // trapezoid
SkPoint p2[] = {{0, 0}, {40, 40}, {80, 40}, {40, 0}}; // diamond
@@ -97,7 +97,7 @@ protected:
}
}
- virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+ void onDraw(SkCanvas* canvas) SK_OVERRIDE {
// Stroke widths are:
// 0(may use hairline rendering), 10(common case for stroke-style)
// 40(>= geometry width/height, make the contour filled in fact)