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

gm/etc1bitmap.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"
 
 #include "Resources.h"
@@ skipping 63 matching lines @@
 /**
  *  Test decoding an image from a PKM or KTX file and then
  *  from compressed ETC1 data.
  */
 class ETC1BitmapGM : public GM {
 public:
     ETC1BitmapGM() { }
     virtual ~ETC1BitmapGM() { }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         SkString str = SkString("etc1bitmap_");
         str.append(this->fileExtension());
         return str;
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(128, 128);
     }
 
     virtual SkString fileExtension() const = 0;
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkBitmap bm;
         SkString filename = GetResourcePath("mandrill_128.");
         filename.append(this->fileExtension());
         SkAutoTUnref<SkData> fileData(SkData::NewFromFileName(filename.c_str()));
         if (NULL == fileData) {
             SkDebugf("Could not open the file. Did you forget to set the resourcePath?\n");
             return;
         }
 
         if (!SkInstallDiscardablePixelRef(fileData, &bm)) {
             SkDebugf("Could not install discardable pixel ref.\n");
             return;
         }
 
         canvas->drawBitmap(bm, 0, 0);
     }
 
 private:
     typedef GM INHERITED;
 };
 
 // This class specializes ETC1BitmapGM to load the mandrill_128.pkm file.
 class ETC1Bitmap_PKM_GM : public ETC1BitmapGM {
 public:
     ETC1Bitmap_PKM_GM() : ETC1BitmapGM() { }
     virtual ~ETC1Bitmap_PKM_GM() { }
 
 protected:
 
-    virtual SkString fileExtension() const SK_OVERRIDE { return SkString("pkm"); }
+    SkString fileExtension() const SK_OVERRIDE { return SkString("pkm"); }
 
 private:
     typedef ETC1BitmapGM INHERITED;
 };
 
 // This class specializes ETC1BitmapGM to load the mandrill_128.ktx file.
 class ETC1Bitmap_KTX_GM : public ETC1BitmapGM {
 public:
     ETC1Bitmap_KTX_GM() : ETC1BitmapGM() { }
     virtual ~ETC1Bitmap_KTX_GM() { }
 
 protected:
 
-    virtual SkString fileExtension() const SK_OVERRIDE { return SkString("ktx"); }
+    SkString fileExtension() const SK_OVERRIDE { return SkString("ktx"); }
 
 private:
     typedef ETC1BitmapGM INHERITED;
 };
 
 // This class specializes ETC1BitmapGM to load the mandrill_128.r11.ktx file.
 class ETC1Bitmap_R11_KTX_GM : public ETC1BitmapGM {
 public:
     ETC1Bitmap_R11_KTX_GM() : ETC1BitmapGM() { }
     virtual ~ETC1Bitmap_R11_KTX_GM() { }
 
 protected:
 
-    virtual SkString fileExtension() const SK_OVERRIDE { return SkString("r11.ktx"); }
+    SkString fileExtension() const SK_OVERRIDE { return SkString("r11.ktx"); }
 
 private:
     typedef ETC1BitmapGM INHERITED;
 };
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
 /**
  *  Test decoding an image from a PKM file and then
  *  from non-power-of-two compressed ETC1 data. First slice
  *  off a row and column of blocks in order to make it non-power
  *  of two.
  */
 class ETC1Bitmap_NPOT_GM : public GM {
 public:
     ETC1Bitmap_NPOT_GM() { }
     virtual ~ETC1Bitmap_NPOT_GM() { }
 
 protected:
-    virtual SkString onShortName() SK_OVERRIDE {
+    SkString onShortName() SK_OVERRIDE {
         return SkString("etc1bitmap_npot");
     }
 
-    virtual SkISize onISize() SK_OVERRIDE {
+    SkISize onISize() SK_OVERRIDE {
         return SkISize::Make(124, 124);
     }
 
-    virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(SkCanvas* canvas) SK_OVERRIDE {
         SkBitmap bm;
         SkString pkmFilename = GetResourcePath("mandrill_128.pkm");
         SkAutoDataUnref fileData(SkData::NewFromFileName(pkmFilename.c_str()));
         if (NULL == fileData) {
             SkDebugf("Could not open the file. Did you forget to set the resourcePath?\n");
             return;
         }
 
         SkAutoMalloc am(fileData->size());
         memcpy(am.get(), fileData->data(), fileData->size());
@@ skipping 27 matching lines @@
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_PKM_GM); )
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_KTX_GM); )
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_R11_KTX_GM); )
 
 #ifndef SK_IGNORE_ETC1_SUPPORT
 DEF_GM( return SkNEW(skiagm::ETC1Bitmap_NPOT_GM); )
 #endif  // SK_IGNORE_ETC1_SUPPORT