Cleanup: More override fixes - another round.

bench/PremulAndUnpremulAlphaOpsBench.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 "Benchmark.h"
 #include "SkCanvas.h"
 #include "SkConfig8888.h"
@@ skipping 11 matching lines @@
     PremulAndUnpremulAlphaOpsBench(SkColorType ct) {
         fColorType = ct;
         fName.printf("premul_and_unpremul_alpha_%s", sk_tool_utils::colortype_name(ct));
     }
 
 protected:
     virtual const char* onGetName() SK_OVERRIDE {
         return fName.c_str();
     }
 
-    virtual void onPreDraw() {
+    virtual void onPreDraw() SK_OVERRIDE {
         SkImageInfo info = SkImageInfo::Make(W, H, fColorType, kUnpremul_SkAlphaType);
         fBmp1.allocPixels(info);   // used in writePixels
 
         for (int h = 0; h < H; ++h) {
             for (int w = 0; w < W; ++w) {
                 // SkColor places A in the right slot for either RGBA or BGRA
                 *fBmp1.getAddr32(w, h) = SkColorSetARGB(h & 0xFF, w & 0xFF, w & 0xFF, w & 0xFF);
             }
         }
 
@@ skipping 14 matching lines @@
 private:
     SkColorType fColorType;
     SkString fName;
 
     typedef Benchmark INHERITED;
 };
 
 
 DEF_BENCH(return new PremulAndUnpremulAlphaOpsBench(kRGBA_8888_SkColorType));
 DEF_BENCH(return new PremulAndUnpremulAlphaOpsBench(kBGRA_8888_SkColorType));