From 72c9faab45124e08c85f70ca38536914862d947c Mon Sep 17 00:00:00 2001 From: mtklein Date: Fri, 9 Jan 2015 10:06:39 -0800 Subject: 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 --- gm/polygons.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gm/polygons.cpp') 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) -- cgit v1.2.3