Spin off GM::runAsBench() from flags.

gm/convexpolyclip.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"
 
@@ skipping 197 matching lines @@
                     x += textW + 2 * kMargin;
                 }
                 y += fBmp.height() + kMargin;
             }
             y = 0;
             startX += 2 * fBmp.width() + SkScalarCeilToInt(2 * textW) + 6 * kMargin;
         }
     }
 
     virtual uint32_t onGetFlags() const {
-        return kAsBench_Flag | kSkipTiled_Flag;
+        return kSkipTiled_Flag;
     }
 
+    bool runAsBench() const SK_OVERRIDE { return true; }
+
 private:
     class Clip {
     public:
         enum ClipType {
             kNone_ClipType,
             kPath_ClipType,
             kRect_ClipType
         };
 
         Clip () : fClipType(kNone_ClipType) {}
@@ skipping 63 matching lines @@
 
     SkTLList<Clip>   fClips;
     SkBitmap         fBmp;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return SkNEW(ConvexPolyClip); )
 
 }