Fix up all the easy virtual ... SK_OVERRIDE cases.

gm/roundrects.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 "SkTArray.h"
 #include "SkRandom.h"
 #include "SkMatrix.h"
 #include "SkBlurMaskFilter.h"
 #include "SkGradientShader.h"
 #include "SkBlurDrawLooper.h"
 #include "SkRect.h"
 #include "SkRRect.h"
 
 namespace skiagm {
 
 class RoundRectGM : public GM {
 public:
     RoundRectGM() {
         this->setBGColor(0xFF000000);
         this->makePaints();
         this->makeMatrices();
     }
 
 protected:
-    virtual uint32_t onGetFlags() const SK_OVERRIDE {
+    uint32_t onGetFlags() const SK_OVERRIDE {
         return kSkipTiled_Flag;
     }
 
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("roundrects");
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(1200, 900);
     }
 
     void makePaints() {
         {
         // no AA
         SkPaint p;
         fPaints.push_back(p);
         }
 
@@ skipping 83 matching lines @@
 
     SkColor genColor(SkRandom* rand) {
         SkScalar hsv[3];
         hsv[0] = rand->nextRangeF(0.0f, 360.0f);
         hsv[1] = rand->nextRangeF(0.75f, 1.0f);
         hsv[2] = rand->nextRangeF(0.75f, 1.0f);
 
         return SkHSVToColor(hsv);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkRandom rand(1);
         canvas->translate(20 * SK_Scalar1, 20 * SK_Scalar1);
         SkRect rect = SkRect::MakeLTRB(-20, -30, 20, 30);
         SkRRect circleRect;
         circleRect.setRectXY(rect, 5, 5);
 
         const SkScalar kXStart = 60.0f;
         const SkScalar kYStart = 80.0f;
         const int kXStep = 150;
         const int kYStep = 160;
@@ skipping 181 matching lines @@
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new RoundRectGM; }
 static GMRegistry reg(MyFactory);
 
 }