Spin off GM::runAsBench() from flags.

gm/gm.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef skiagm_DEFINED
 #define skiagm_DEFINED
 
@@ skipping 35 matching lines @@
             kSkipPipe_Flag              = 1 << 2,
             kSkipPipeCrossProcess_Flag  = 1 << 3,
             kSkipTiled_Flag             = 1 << 4,
             kSkip565_Flag               = 1 << 5,
             kSkipScaledReplay_Flag      = 1 << 6,
             kSkipGPU_Flag               = 1 << 7,
             kSkipPDFRasterization_Flag  = 1 << 8,
 
             kGPUOnly_Flag               = 1 << 9,
 
-            kAsBench_Flag               = 1 << 10, // Run the GM as a benchmark in the bench tool
-
             kNoBBH_Flag                 = 1 << 11, // May draw wrong using a bounding-box hierarchy
         };
 
         enum Mode {
             kGM_Mode,
             kSample_Mode,
             kBench_Mode,
         };
 
         void setMode(Mode mode) { fMode = mode; }
         Mode getMode() const { return fMode; }
 
         void draw(SkCanvas*);
         void drawBackground(SkCanvas*);
         void drawContent(SkCanvas*);
 
         SkISize getISize() { return this->onISize(); }
         const char* getName();
 
+        virtual bool runAsBench() const { return false; }
+
         uint32_t getFlags() const {
             return this->onGetFlags();
         }
 
         SkScalar width() {
             return SkIntToScalar(this->getISize().width());
         }
         SkScalar height() {
             return SkIntToScalar(this->getISize().height());
         }
@@ skipping 56 matching lines @@
         SkISize onISize() SK_OVERRIDE;
         SkString onShortName() SK_OVERRIDE;
     private:
         SkString fName;
         void (*fDrawProc)(SkCanvas*);
         SkISize fSize;
     };
 }
 
 #endif