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

gm/nested.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 "SkRandom.h"
 #include "SkRRect.h"
 
 namespace skiagm {
 
 // Test out various combinations of nested rects, ovals and rrects.
 class NestedGM : public GM {
 public:
     NestedGM(bool doAA) : fDoAA(doAA) {
         this->setBGColor(0xFFDDDDDD);
     }
 
 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 {
         SkString name("nested");
         if (fDoAA) {
             name.append("_aa");
         } else {
             name.append("_bw");
         }
         return name;
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(kImageWidth, kImageHeight);
     }
 
     enum Shapes {
         kRect_Shape = 0,
         kRRect_Shape,
         kOval_Shape,
         kShapeCount
     };
 
     static void AddShape(SkPath* path, const SkRect& rect, Shapes shape, SkPath::Direction dir) {
         switch (shape) {
             case kRect_Shape:
                 path->addRect(rect, dir);
                 break;
             case kRRect_Shape: {
                 SkRRect rr;
                 rr.setRectXY(rect, 5, 5);
                 path->addRRect(rr, dir);
                 break;
                 }
             case kOval_Shape:
                 path->addOval(rect, dir);
                 break;
             default:
                 break;
         }
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
 
         SkPaint shapePaint;
         shapePaint.setColor(SK_ColorBLACK);
         shapePaint.setAntiAlias(fDoAA);
 
         SkRect outerRect = SkRect::MakeWH(40, 40);
 
         SkRect innerRects[] = {
             { 10, 10, 30, 30 },     // small
             { .5f, 18, 4.5f, 22 }   // smaller and offset to left
@@ skipping 43 matching lines @@
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new NestedGM(true); )
 DEF_GM( return new NestedGM(false); )
 
 
 }