Spin off GM::runAsBench() from flags.

gm/variedtext.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
@@ skipping 121 matching lines @@
             wirePaint.setStyle(SkPaint::kStroke_Style);
             for (int i = 0; i < kCnt; ++i) {
                 canvas->drawRect(fClipRects[i], wirePaint);
             }
         }
     }
 
     uint32_t onGetFlags() const SK_OVERRIDE {
         // The aa hairline stroked rects used to visualize the clip draw slightly differently in
         // quilt mode in dm.
-        return kAsBench_Flag | kSkipTiled_Flag;
+        return kSkipTiled_Flag;
     }
+    bool runAsBench() const SK_OVERRIDE { return true; }
 
 private:
     static const int kCnt = 30;
     static const int kMinLength = 15;
     static const int kMaxLength = 40;
 
     bool        fEffectiveClip;
     bool        fLCD;
     SkTypeface* fTypefacesToUnref[4];
     SkPaint     fPaint;
 
     // precomputed for each text draw
     SkString        fStrings[kCnt];
     SkColor         fColors[kCnt];
     SkScalar        fPtSizes[kCnt];
     SkTypeface*     fTypefaces[kCnt];
     SkPoint         fPositions[kCnt];
     SkRect          fClipRects[kCnt];
 
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM( return SkNEW(VariedTextGM(false, false)); )
 DEF_GM( return SkNEW(VariedTextGM(true, false)); )
 DEF_GM( return SkNEW(VariedTextGM(false, true)); )
 DEF_GM( return SkNEW(VariedTextGM(true, true)); )