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

gm/downsamplebitmap.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 "Resources.h"
@@ skipping 22 matching lines @@
     }
 
     const char* filterLevelToString() {
         static const char *filterLevelNames[] = {
             "none", "low", "medium", "high"
         };
         return filterLevelNames[fFilterLevel];
     }
 
 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 fName;
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         make_bitmap_wrapper();
         return SkISize::Make(fBM.width(), 4 * fBM.height());
     }
 
     void make_bitmap_wrapper() {
         if (!fBitmapMade) {
             fBitmapMade = true;
             make_bitmap();
         }
     }
 
     virtual void make_bitmap() = 0;
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         make_bitmap_wrapper();
 
         int curY = 0;
         int curHeight;
         float curScale = 1;
         do {
 
             SkMatrix matrix;
             matrix.setScale( curScale, curScale );
 
@@ skipping 20 matching lines @@
   public:
       DownsampleBitmapTextGM(float textSize, SkPaint::FilterLevel filterLevel)
       : INHERITED(filterLevel), fTextSize(textSize)
         {
             fName.printf("downsamplebitmap_text_%s_%.2fpt", this->filterLevelToString(), fTextSize);
         }
 
   protected:
       float fTextSize;
 
-      virtual void make_bitmap() SK_OVERRIDE {
+      void make_bitmap() SK_OVERRIDE {
           fBM.allocN32Pixels(int(fTextSize * 8), int(fTextSize * 6));
           SkCanvas canvas(fBM);
           canvas.drawColor(SK_ColorWHITE);
 
           SkPaint paint;
           paint.setAntiAlias(true);
           paint.setSubpixelText(true);
           paint.setTextSize(fTextSize);
 
           setTypeface(&paint, "Times", SkTypeface::kNormal);
@@ skipping 14 matching lines @@
       DownsampleBitmapCheckerboardGM(int size, int numChecks, SkPaint::FilterLevel filterLevel)
       : INHERITED(filterLevel), fSize(size), fNumChecks(numChecks)
         {
             fName.printf("downsamplebitmap_checkerboard_%s_%d_%d", this->filterLevelToString(), fSize, fNumChecks);
         }
 
   protected:
       int fSize;
       int fNumChecks;
 
-      virtual void make_bitmap() SK_OVERRIDE {
+      void make_bitmap() SK_OVERRIDE {
           fBM.allocN32Pixels(fSize, fSize);
           for (int y = 0; y < fSize; ++y) {
               for (int x = 0; x < fSize; ++x) {
                   SkPMColor* s = fBM.getAddr32(x, y);
                   int cx = (x * fNumChecks) / fSize;
                   int cy = (y * fNumChecks) / fSize;
                   if ((cx+cy)%2) {
                       *s = 0xFFFFFFFF;
                   } else {
                       *s = 0xFF000000;
@@ skipping 10 matching lines @@
       DownsampleBitmapImageGM(const char filename[], SkPaint::FilterLevel filterLevel)
       : INHERITED(filterLevel), fFilename(filename)
         {
             fName.printf("downsamplebitmap_image_%s_%s", this->filterLevelToString(), filename);
         }
 
   protected:
       SkString fFilename;
       int fSize;
 
-      virtual void make_bitmap() SK_OVERRIDE {
+      void make_bitmap() SK_OVERRIDE {
           SkImageDecoder* codec = NULL;
           SkString resourcePath = GetResourcePath(fFilename.c_str());
           SkFILEStream stream(resourcePath.c_str());
           if (stream.isValid()) {
               codec = SkImageDecoder::Factory(&stream);
           }
           if (codec) {
               stream.rewind();
               codec->decode(&stream, &fBM, kN32_SkColorType, SkImageDecoder::kDecodePixels_Mode);
               SkDELETE(codec);
@@ skipping 25 matching lines @@
 DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, SkPaint::kLow_FilterLevel); )
 DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", SkPaint::kLow_FilterLevel); )
 DEF_GM( return new DownsampleBitmapImageGM("mandrill_132x132_12x12.astc",
                                            SkPaint::kLow_FilterLevel); )
 
 DEF_GM( return new DownsampleBitmapTextGM(72, SkPaint::kNone_FilterLevel); )
 DEF_GM( return new DownsampleBitmapCheckerboardGM(512,256, SkPaint::kNone_FilterLevel); )
 DEF_GM( return new DownsampleBitmapImageGM("mandrill_512.png", SkPaint::kNone_FilterLevel); )
 DEF_GM( return new DownsampleBitmapImageGM("mandrill_132x132_12x12.astc",
                                            SkPaint::kNone_FilterLevel); )