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

bench/DeferredSurfaceCopyBench.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 "SkDeferredCanvas.h"
 #include "SkDevice.h"
 #include "SkImage.h"
 #include "SkSurface.h"
 #if SK_SUPPORT_GPU
 #include "GrRenderTarget.h"
 #endif
 
 class DeferredSurfaceCopyBench : public Benchmark {
     enum {
         kSurfaceWidth = 1000,
         kSurfaceHeight = 1000,
     };
 public:
     DeferredSurfaceCopyBench(bool discardableContents) {
         fDiscardableContents = discardableContents;
     }
 
 protected:
-    const char* onGetName() SK_OVERRIDE {
+    const char* onGetName() override {
         return fDiscardableContents ? "DeferredSurfaceCopy_discardable" :
             "DeferredSurfaceCopy_nonDiscardable";
     }
 
-    void onDraw(const int loops, SkCanvas* canvas) SK_OVERRIDE {
+    void onDraw(const int loops, SkCanvas* canvas) override {
         // The canvas is not actually used for this test except to provide
         // configuration information: gpu, multisampling, size, etc?
         SkImageInfo info = SkImageInfo::MakeN32Premul(kSurfaceWidth, kSurfaceHeight);
         const SkRect fullCanvasRect = SkRect::MakeWH(
             SkIntToScalar(kSurfaceWidth), SkIntToScalar(kSurfaceHeight));
         SkAutoTUnref<SkSurface> surface(canvas->newSurface(info));
 
         // newSurface() can return NULL for several reasons, so we need to check
         if (NULL == surface.get()) {
             SkDebugf("DeferredSurfaceCopyBench newSurface failed, bench results are meaningless\n");
@@ skipping 20 matching lines @@
 private:
     bool fDiscardableContents;
 
     typedef Benchmark INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new DeferredSurfaceCopyBench(false); )
 DEF_BENCH( return new DeferredSurfaceCopyBench(true); )