Enable new gradients + suppress gms for now

This reverts commit 2c770271e612376508c18793c7067598378a00d9.

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/811753003

1 files changed, 6 insertions, 2 deletions

diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp
index 96ce59f841..47440f6d18 100644
--- a/gm/gradtext.cpp
+++ b/gm/gradtext.cpp
@@ -106,7 +106,11 @@ protected:
         return SkString("gradtext");
     }
 
-    virtual SkISize onISize() { return SkISize::Make(500, 480); }
+    uint32_t onGetFlags() const SK_OVERRIDE {
+        return kSkipTiled_Flag;
+    }
+
+    SkISize onISize() SK_OVERRIDE { return SkISize::Make(500, 480); }
 
     static void draw_text(SkCanvas* canvas, const SkPaint& paint) {
         const char* text = "When in the course of human events";
@@ -127,7 +131,7 @@ protected:
         draw_text(canvas, p);
     }
 
-    virtual void onDraw(SkCanvas* canvas) {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkPaint paint;
         sk_tool_utils::set_portable_typeface(&paint);
         paint.setTextSize(SkIntToScalar(26));