| Index: gm/tilemodes.cpp
|
| diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp
|
| index 33d1b2347156003638c628d70f217b50dfc25f48..ad8aa12f4d3799be44d33c72321daf58a3b6a8c1 100644
|
| --- a/gm/tilemodes.cpp
|
| +++ b/gm/tilemodes.cpp
|
| @@ -71,14 +71,14 @@ protected:
|
|
|
| SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); }
|
|
|
| - virtual void onOnceBeforeDraw() SK_OVERRIDE {
|
| + void onOnceBeforeDraw() SK_OVERRIDE {
|
| int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
|
| for (size_t i = 0; i < SK_ARRAY_COUNT(gColorTypes); i++) {
|
| makebm(&fTexture[i], gColorTypes[i], size, size);
|
| }
|
| }
|
|
|
| - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
|
|
| int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
|
|
|
| @@ -194,7 +194,7 @@ public:
|
| }
|
|
|
| protected:
|
| - virtual uint32_t onGetFlags() const SK_OVERRIDE {
|
| + uint32_t onGetFlags() const SK_OVERRIDE {
|
| return kSkipTiled_Flag;
|
| }
|
|
|
| @@ -204,7 +204,7 @@ protected:
|
|
|
| SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 560); }
|
|
|
| - virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| + void onDraw(SkCanvas* canvas) SK_OVERRIDE {
|
| canvas->scale(SkIntToScalar(3)/2, SkIntToScalar(3)/2);
|
|
|
| const SkScalar w = SkIntToScalar(gWidth);
|
|
|