Spin off GM::runAsBench() from flags.

gm/circularclips.cpp

 /*
  * Copyright 2013 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"
 
 class CircularClipsGM : public skiagm::GM {
     SkScalar fX1, fX2, fY, fR;
     SkPath   fCircle1, fCircle2;
 
 public:
     CircularClipsGM() {
         fX1 = 80;
         fX2 = 120;
         fY = 50;
         fR = 40;
 
         fCircle1.addCircle(fX1, fY, fR, SkPath::kCW_Direction);
         fCircle2.addCircle(fX2, fY, fR, SkPath::kCW_Direction);
     }
 
 protected:
     uint32_t onGetFlags() const SK_OVERRIDE {
-        return kSkipTiled_Flag | kAsBench_Flag;
+        return kSkipTiled_Flag;
     }
 
+    bool runAsBench() const SK_OVERRIDE { return true; }
+
     SkString onShortName() SK_OVERRIDE {
         return SkString("circular-clips");
     }
 
     SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(800, 600);
     }
 
     void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRegion::Op ops[] = {
@@ skipping 32 matching lines @@
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new CircularClipsGM; )