C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}

bench/ImageFilterCollapse.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 "Benchmark.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 21 matching lines @@
         // Create a chain of ImageFilters from colorFilters
         fImageFilter = NULL;
         for(int i = nFilters; i --> 0;) {
             SkAutoTUnref<SkImageFilter> filter(
                         SkColorFilterImageFilter::Create(colorFilters[i], fImageFilter, NULL)
             );
             SkRefCnt_SafeAssign(fImageFilter, filter.get());
         }
     }
 
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         makeBitmap();
 
         for(int i = 0; i < loops; i++) {
             SkPaint paint;
             paint.setImageFilter(fImageFilter);
             canvas->drawBitmap(fBitmap, 0, 0, &paint);
         }
     }
 
 private:
@@ skipping 19 matching lines @@
         paint.setShader(shader);
         canvas.drawPaint(paint);
     }
 };
 
 class TableCollapseBench: public BaseImageFilterCollapseBench {
 public:
     virtual ~TableCollapseBench() {}
 
 protected:
-    virtual const char* onGetName() SK_OVERRIDE {
+    virtual const char* onGetName() override {
         return "image_filter_collapse_table";
     }
 
-    virtual void onPreDraw() SK_OVERRIDE {
+    virtual void onPreDraw() override {
         for (int i = 0; i < 256; ++i) {
             int n = i >> 5;
             table1[i] = (n << 5) | (n << 2) | (n >> 1);
 
             table2[i] = i * i / 255;
 
             float fi = i / 255.0f;
             table3[i] = static_cast<uint8_t>(sqrtf(fi) * 255);
         }
 
@@ skipping 31 matching lines @@
     matrix[2] = matrix[7] = matrix[12] = 0.0722f;
     matrix[18] = 1.0f;
     return SkColorMatrixFilter::Create(matrix);
 }
 
 class MatrixCollapseBench: public BaseImageFilterCollapseBench {
 public:
     virtual ~MatrixCollapseBench() {}
 
 protected:
-    virtual const char* onGetName() SK_OVERRIDE {
+    virtual const char* onGetName() override {
         return "image_filter_collapse_matrix";
     }
 
-    virtual void onPreDraw() SK_OVERRIDE {
+    virtual void onPreDraw() override {
         SkColorFilter* colorFilters[] = {
             make_brightness(0.1f),
             make_grayscale(),
             make_brightness(-0.1f),
         };
 
         doPreDraw(colorFilters, SK_ARRAY_COUNT(colorFilters));
 
         for(unsigned i = 0; i < SK_ARRAY_COUNT(colorFilters); i++) {
             colorFilters[i]->unref();
         }
     }
 };
 
 DEF_BENCH(return new TableCollapseBench;)
 DEF_BENCH(return new MatrixCollapseBench;)