| Index: gm/tilemodes_scaled.cpp | 
| diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp | 
| index e9c6c9950ad631d6d0912f1501b49c6675d53223..a79002b56b31788537da9a7ce7fc823ea6afdac6 100644 | 
| --- a/gm/tilemodes_scaled.cpp | 
| +++ b/gm/tilemodes_scaled.cpp | 
| @@ -68,12 +68,18 @@ public: | 
| SkBitmap    fTexture[SK_ARRAY_COUNT(gColorTypes)]; | 
|  | 
| protected: | 
| - | 
| enum { | 
| kPOTSize = 4, | 
| kNPOTSize = 3, | 
| }; | 
|  | 
| +    virtual uint32_t onGetFlags() const SK_OVERRIDE { | 
| +        if (!fPowerOfTwoSize) { | 
| +            return kSkipTiled_Flag;  // Only for 565.  8888 is fine. | 
| +        } | 
| +        return 0; | 
| +    } | 
| + | 
| SkString onShortName() { | 
| SkString name("scaled_tilemodes"); | 
| if (!fPowerOfTwoSize) { | 
| @@ -214,6 +220,10 @@ public: | 
| } | 
|  | 
| protected: | 
| +    virtual uint32_t onGetFlags() const SK_OVERRIDE { | 
| +        return kSkipTiled_Flag; | 
| +    } | 
| + | 
| SkString onShortName() { | 
| return fName; | 
| } | 
|  |