| Index: gm/tilemodes_scaled.cpp
|
| diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp
|
| index 32f640acaa045b6ae988ecb84d8bad4ead22c8f2..4edd11586f0b8151a592d1b51aa0575ad5da347c 100644
|
| --- a/gm/tilemodes_scaled.cpp
|
| +++ b/gm/tilemodes_scaled.cpp
|
| @@ -75,21 +75,21 @@ protected:
|
|
|
| #ifdef SK_CPU_ARM64
|
| // Skip tiled drawing on 64-bit ARM until https://skbug.com/2908 is fixed.
|
| - virtual uint32_t onGetFlags() const SK_OVERRIDE {
|
| + uint32_t onGetFlags() const SK_OVERRIDE {
|
| return kSkipTiled_Flag;
|
| }
|
| #endif
|
|
|
| SkISize onISize() SK_OVERRIDE { return SkISize::Make(880, 760); }
|
|
|
| - 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 {
|
| float scale = 32.f/kPOTSize;
|
|
|
| int size = fPowerOfTwoSize ? kPOTSize : kNPOTSize;
|
| @@ -213,7 +213,7 @@ public:
|
| }
|
|
|
| protected:
|
| - virtual uint32_t onGetFlags() const SK_OVERRIDE {
|
| + uint32_t onGetFlags() const SK_OVERRIDE {
|
| return kSkipTiled_Flag;
|
| }
|
|
|
| @@ -223,7 +223,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);
|
|
|