| Index: gm/strokes.cpp
|
| diff --git a/gm/strokes.cpp b/gm/strokes.cpp
|
| index 0a8f121b491fa296c028e3f7bd43b67e7026c59f..1a6937e1bd71bd010c8c60a46a487ef85d176bbc 100644
|
| --- a/gm/strokes.cpp
|
| +++ b/gm/strokes.cpp
|
| @@ -39,19 +39,19 @@ public:
|
| StrokesGM() {}
|
|
|
| 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("strokes_round");
|
| }
|
|
|
| - virtual SkISize onISize() SK_OVERRIDE {
|
| + SkISize onISize() SK_OVERRIDE {
|
| return SkISize::Make(W, H*2);
|
| }
|
|
|
| - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| SkPaint paint;
|
| paint.setStyle(SkPaint::kStroke_Style);
|
| paint.setStrokeWidth(SkIntToScalar(9)/2);
|
| @@ -95,15 +95,15 @@ public:
|
| }
|
|
|
| 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("strokes_poly");
|
| }
|
|
|
| - virtual SkISize onISize() SK_OVERRIDE {
|
| + SkISize onISize() SK_OVERRIDE {
|
| return SkISize::Make(W, H*2);
|
| }
|
|
|
| @@ -113,7 +113,7 @@ protected:
|
| canvas->concat(matrix);
|
| }
|
|
|
| - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| canvas->drawColor(SK_ColorWHITE);
|
|
|
| SkPaint paint;
|
| @@ -196,19 +196,19 @@ public:
|
| Strokes3GM() {}
|
|
|
| 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("strokes3");
|
| }
|
|
|
| - virtual SkISize onISize() SK_OVERRIDE {
|
| + SkISize onISize() SK_OVERRIDE {
|
| return SkISize::Make(W, H*2);
|
| }
|
|
|
| - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| SkPaint origPaint;
|
| origPaint.setAntiAlias(true);
|
| origPaint.setStyle(SkPaint::kStroke_Style);
|
|
|