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

gm/circles.cpp

 
 /*
  * Copyright 2012 Intel 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 "SkBlurDrawLooper.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkGradientShader.h"
 #include "SkMatrix.h"
 #include "SkRandom.h"
 #include "SkTArray.h"
 
 namespace skiagm {
 
 class CircleGM : public GM {
 public:
     CircleGM() {
         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("circles");
     }
 
-    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 101 matching lines @@
         fMatrices.push_back(m);
         }
 
         {
         SkMatrix m;
         m.setRotate(SkIntToScalar(30));
         fMatrices.push_back(m);
         }
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         // Draw a giant AA circle as the background.
         SkISize size = this->getISize();
         SkScalar giantRadius = SkTMin(SkIntToScalar(size.fWidth),
                                       SkIntToScalar(size.fHeight)) / 2.f;
         SkPoint giantCenter = SkPoint::Make(SkIntToScalar(size.fWidth/2),
                                             SkIntToScalar(size.fHeight/2));
         SkPaint giantPaint;
         giantPaint.setAntiAlias(true);
         giantPaint.setColor(0x80808080);
         canvas->drawCircle(giantCenter.fX, giantCenter.fY, giantRadius, giantPaint);
@@ skipping 44 matching lines @@
     SkTArray<SkPaint> fPaints;
     SkTArray<SkMatrix> fMatrices;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new CircleGM; }
 static GMRegistry reg(MyFactory);
 
 }