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

NOPRESUBMIT=true

BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002

Review URL: https://codereview.chromium.org/1037793002

10 files changed, 61 insertions, 61 deletions

diff --git a/experimental/AndroidPathRenderer/GrAndroidPathRenderer.h b/experimental/AndroidPathRenderer/GrAndroidPathRenderer.h
index 38d2030468..a7225fa660 100644
--- a/experimental/AndroidPathRenderer/GrAndroidPathRenderer.h
+++ b/experimental/AndroidPathRenderer/GrAndroidPathRenderer.h
@@ -16,13 +16,13 @@ public:
     virtual bool canDrawPath(const SkPath& path,
                              const SkStrokeRec& stroke,
                              const GrDrawTarget* target,
-                             bool antiAlias) const SK_OVERRIDE;
+                             bool antiAlias) const override;
 
 protected:
     virtual bool onDrawPath(const SkPath& path,
                             const SkStrokeRec& stroke,
                             GrDrawTarget* target,
-                            bool antiAlias) SK_OVERRIDE;
+                            bool antiAlias) override;
 
 private:
     typedef GrPathRenderer INHERITED;
diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h
index 58c239a053..c8a95e9e95 100644
--- a/experimental/PdfViewer/SkNulCanvas.h
+++ b/experimental/PdfViewer/SkNulCanvas.h
@@ -26,13 +26,13 @@ public:
     explicit SkNulCanvas(const SkBitmap& bitmap) : SkCanvas(bitmap) {}
     virtual ~SkNulCanvas() {}
 
-    void beginCommentGroup(const char* description) SK_OVERRIDE {}
-    void addComment(const char* kywd, const char* value) SK_OVERRIDE {}
-    void endCommentGroup() SK_OVERRIDE {}
-    SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE {return NULL;}
+    void beginCommentGroup(const char* description) override {}
+    void addComment(const char* kywd, const char* value) override {}
+    void endCommentGroup() override {}
+    SkDrawFilter* setDrawFilter(SkDrawFilter* filter) override {return NULL;}
 
-    bool isClipEmpty() const SK_OVERRIDE { return false; }
-    bool getClipBounds(SkRect* bounds) const SK_OVERRIDE {
+    bool isClipEmpty() const override { return false; }
+    bool getClipBounds(SkRect* bounds) const override {
         if (NULL != bounds) {
             bounds->setXYWH(0, 0,
                             SkIntToScalar(this->imageInfo().width()),
@@ -40,7 +40,7 @@ public:
         }
         return true;
     }
-    bool getClipDeviceBounds(SkIRect* bounds) const SK_OVERRIDE {
+    bool getClipDeviceBounds(SkIRect* bounds) const override {
         if (NULL != bounds) {
             bounds->setLargest();
         }
@@ -52,54 +52,54 @@ protected:
     virtual SkBaseDevice* setDevice(SkBaseDevice* device) {return NULL;}
 
     virtual SaveLayerStrategy willSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                                            SaveFlags flags) SK_OVERRIDE {
+                                            SaveFlags flags) override {
         this->INHERITED::willSaveLayer(bounds, paint, flags);
         return kNoLayer_SaveLayerStrategy;
     }
 
     virtual void onDrawText(const void* text, size_t byteLength, SkScalar x,
-                          SkScalar y, const SkPaint& paint) SK_OVERRIDE {}
+                          SkScalar y, const SkPaint& paint) override {}
     virtual void onDrawPosText(const void* text, size_t byteLength,
-                             const SkPoint pos[], const SkPaint& paint) SK_OVERRIDE {}
+                             const SkPoint pos[], const SkPaint& paint) override {}
     virtual void onDrawPosTextH(const void* text, size_t byteLength,
                               const SkScalar xpos[], SkScalar constY,
-                              const SkPaint& paint) SK_OVERRIDE {}
+                              const SkPaint& paint) override {}
     virtual void onDrawTextOnPath(const void* text, size_t byteLength,
                                 const SkPath& path, const SkMatrix* matrix,
-                                const SkPaint& paint) SK_OVERRIDE {}
+                                const SkPaint& paint) override {}
 
-    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {}
-    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {}
-    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE {}
-    void onClipRegion(const SkRegion&, SkRegion::Op)  SK_OVERRIDE {}
+    void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override {}
+    void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override {}
+    void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override {}
+    void onClipRegion(const SkRegion&, SkRegion::Op)  override {}
 
-    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) SK_OVERRIDE {}
+    void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override {}
 
-    void onDrawPaint(const SkPaint& paint) SK_OVERRIDE {}
+    void onDrawPaint(const SkPaint& paint) override {}
     void onDrawPoints(PointMode mode, size_t count, const SkPoint pts[],
-                      const SkPaint& paint) SK_OVERRIDE {}
-    void onDrawRect(const SkRect& rect, const SkPaint& paint) SK_OVERRIDE {}
-    void onDrawOval(const SkRect& oval, const SkPaint&) SK_OVERRIDE {}
-    void onDrawRRect(const SkRRect& rrect, const SkPaint& paint) SK_OVERRIDE {}
-    void onDrawPath(const SkPath& path, const SkPaint& paint) SK_OVERRIDE {}
+                      const SkPaint& paint) override {}
+    void onDrawRect(const SkRect& rect, const SkPaint& paint) override {}
+    void onDrawOval(const SkRect& oval, const SkPaint&) override {}
+    void onDrawRRect(const SkRRect& rrect, const SkPaint& paint) override {}
+    void onDrawPath(const SkPath& path, const SkPaint& paint) override {}
     void onDrawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top,
-                      const SkPaint* paint = NULL) SK_OVERRIDE {}
+                      const SkPaint* paint = NULL) override {}
     void onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
                           const SkRect& dst,
                           const SkPaint* paint,
-                          DrawBitmapRectFlags flags) SK_OVERRIDE {}
-    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) SK_OVERRIDE {}
+                          DrawBitmapRectFlags flags) override {}
+    void onDrawImage(const SkImage*, SkScalar left, SkScalar top, const SkPaint*) override {}
     void onDrawImageRect(const SkImage*, const SkRect* src, const SkRect& dst,
-                         const SkPaint*) SK_OVERRIDE{}
+                         const SkPaint*) override{}
     void onDrawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
-                          const SkRect& dst, const SkPaint* paint = NULL) SK_OVERRIDE {}
+                          const SkRect& dst, const SkPaint* paint = NULL) override {}
     void onDrawSprite(const SkBitmap& bitmap, int left, int top,
-                      const SkPaint* paint = NULL) SK_OVERRIDE {}
+                      const SkPaint* paint = NULL) override {}
     void onDrawVertices(VertexMode vmode, int vertexCount,
                         const SkPoint vertices[], const SkPoint texs[],
                         const SkColor colors[], SkXfermode* xmode,
                         const uint16_t indices[], int indexCount,
-                        const SkPaint& paint) SK_OVERRIDE {}
+                        const SkPaint& paint) override {}
 
     
 private:
diff --git a/experimental/PdfViewer/src/SkPdfContext.cpp b/experimental/PdfViewer/src/SkPdfContext.cpp
index 038d38e84e..835a89c86a 100644
--- a/experimental/PdfViewer/src/SkPdfContext.cpp
+++ b/experimental/PdfViewer/src/SkPdfContext.cpp
@@ -19,8 +19,8 @@ public:
                   SkCanvas* canvas)
         : INHERITED(tokenizer, pdfContext, canvas) {}
 
-    SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE;
-    void loop() SK_OVERRIDE;
+    SkPdfResult consumeToken(PdfToken& token) override;
+    void loop() override;
 
 private:
     typedef SkPdfTokenLooper INHERITED;
diff --git a/experimental/PdfViewer/src/SkPdfRenderer.cpp b/experimental/PdfViewer/src/SkPdfRenderer.cpp
index 037606694e..ead65039a6 100644
--- a/experimental/PdfViewer/src/SkPdfRenderer.cpp
+++ b/experimental/PdfViewer/src/SkPdfRenderer.cpp
@@ -212,8 +212,8 @@ public:
     explicit PdfInlineImageLooper(SkPdfTokenLooper* parent)
         : INHERITED(parent) {}
 
-    SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE;
-    void loop() SK_OVERRIDE;
+    SkPdfResult consumeToken(PdfToken& token) override;
+    void loop() override;
 
 private:
     typedef SkPdfTokenLooper INHERITED;
@@ -224,8 +224,8 @@ public:
     explicit PdfCompatibilitySectionLooper(SkPdfTokenLooper* parent)
         : INHERITED (parent) {}
 
-    SkPdfResult consumeToken(PdfToken& token) SK_OVERRIDE;
-    void loop() SK_OVERRIDE;
+    SkPdfResult consumeToken(PdfToken& token) override;
+    void loop() override;
 
 private:
     typedef SkPdfTokenLooper INHERITED;
diff --git a/experimental/SkV8Example/SkV8Example.h b/experimental/SkV8Example/SkV8Example.h
index 38a9c8561a..5185722a77 100644
--- a/experimental/SkV8Example/SkV8Example.h
+++ b/experimental/SkV8Example/SkV8Example.h
@@ -25,15 +25,15 @@ public:
     virtual ~SkV8ExampleWindow();
 
 protected:
-    void onDraw(SkCanvas* canvas) SK_OVERRIDE;
-    void onSizeChange() SK_OVERRIDE;
+    void onDraw(SkCanvas* canvas) override;
+    void onSizeChange() override;
 
 #if SK_SUPPORT_GPU
-    SkSurface* createSurface() SK_OVERRIDE;
+    SkSurface* createSurface() override;
 #endif
 
 #ifdef SK_BUILD_FOR_WIN
-    void onHandleInval(const SkIRect&) SK_OVERRIDE;
+    void onHandleInval(const SkIRect&) override;
 #endif
 
     void windowSizeChanged();
diff --git a/experimental/StrokePathRenderer/GrStrokePathRenderer.h b/experimental/StrokePathRenderer/GrStrokePathRenderer.h
index 9cf34d8712..85752c5681 100644
--- a/experimental/StrokePathRenderer/GrStrokePathRenderer.h
+++ b/experimental/StrokePathRenderer/GrStrokePathRenderer.h
@@ -20,11 +20,11 @@ public:
     virtual bool canDrawPath(const SkPath& path,
                              const SkStrokeRec& stroke,
                              const GrDrawTarget* target,
-                             bool antiAlias) const SK_OVERRIDE;
+                             bool antiAlias) const override;
 
 protected:
     virtual bool onDrawPath(const SkPath& path,
                             const SkStrokeRec& stroke,
                             GrDrawTarget* target,
-                            bool antiAlias) SK_OVERRIDE;
+                            bool antiAlias) override;
 };
diff --git a/experimental/iOSSampleApp/SkSampleUIView.mm b/experimental/iOSSampleApp/SkSampleUIView.mm
index 1d27e11469..0d7a4db2bd 100644
--- a/experimental/iOSSampleApp/SkSampleUIView.mm
+++ b/experimental/iOSSampleApp/SkSampleUIView.mm
@@ -40,7 +40,7 @@ public:
 #endif
     }
     
-    void setUpBackend(SampleWindow* win, int msaaSampleCount) SK_OVERRIDE {
+    void setUpBackend(SampleWindow* win, int msaaSampleCount) override {
         SkASSERT(SkOSWindow::kNone_BackEndType == fBackend);
         
         fBackend = SkOSWindow::kNone_BackEndType;
@@ -101,7 +101,7 @@ public:
         this->windowSizeChanged(win);
     }
     
-    void tearDownBackend(SampleWindow *win) SK_OVERRIDE {
+    void tearDownBackend(SampleWindow *win) override {
 #if SK_SUPPORT_GPU
         SkSafeUnref(fCurContext);
         fCurContext = NULL;
@@ -116,7 +116,7 @@ public:
         fBackend = SampleWindow::kNone_BackEndType;
     }
 
-    SkSurface* createSurface(SampleWindow::DeviceType dType, SampleWindow* win) SK_OVERRIDE{
+    SkSurface* createSurface(SampleWindow::DeviceType dType, SampleWindow* win) override{
 #if SK_SUPPORT_GPU
         if (SampleWindow::IsGpuDeviceType(dType) && fCurContext) {
             SkSurfaceProps props(win->getSurfaceProps());
@@ -128,7 +128,7 @@ public:
 
     virtual void publishCanvas(SampleWindow::DeviceType dType,
                                SkCanvas* canvas,
-                               SampleWindow* win) SK_OVERRIDE {
+                               SampleWindow* win) override {
 #if SK_SUPPORT_GPU
         if (NULL != fCurContext) {
             fCurContext->flush();
@@ -137,7 +137,7 @@ public:
         win->present();
     }
     
-    void windowSizeChanged(SampleWindow* win) SK_OVERRIDE {
+    void windowSizeChanged(SampleWindow* win) override {
 #if SK_SUPPORT_GPU
         if (NULL != fCurContext) {
             SkOSWindow::AttachmentInfo info;
@@ -159,7 +159,7 @@ public:
 #endif
     }
     
-    GrContext* getGrContext() SK_OVERRIDE {
+    GrContext* getGrContext() override {
 #if SK_SUPPORT_GPU
         return fCurContext;
 #else
@@ -167,7 +167,7 @@ public:
 #endif
     }
     
-    GrRenderTarget* getGrRenderTarget() SK_OVERRIDE {
+    GrRenderTarget* getGrRenderTarget() override {
 #if SK_SUPPORT_GPU
         return fCurRenderTarget;
 #else
diff --git a/experimental/tools/PageCachingDocument.cpp b/experimental/tools/PageCachingDocument.cpp
index 7822d55e9e..9baf45c721 100644
--- a/experimental/tools/PageCachingDocument.cpp
+++ b/experimental/tools/PageCachingDocument.cpp
@@ -25,10 +25,10 @@ public:
     virtual ~PageCachingDocument();
     virtual SkCanvas* onBeginPage(SkScalar width,
                                   SkScalar height,
-                                  const SkRect& content) SK_OVERRIDE;
-    void onEndPage() SK_OVERRIDE;
-    bool onClose(SkWStream*) SK_OVERRIDE;
-    void onAbort() SK_OVERRIDE;
+                                  const SkRect& content) override;
+    void onEndPage() override;
+    bool onClose(SkWStream*) override;
+    void onAbort() override;
 
 private:
     struct Page {
diff --git a/experimental/tools/SkDmuxWStream.h b/experimental/tools/SkDmuxWStream.h
index 52376c527f..aac8b18a88 100644
--- a/experimental/tools/SkDmuxWStream.h
+++ b/experimental/tools/SkDmuxWStream.h
@@ -19,10 +19,10 @@ class SkDmuxWStream : public SkWStream {
 public:
     SkDmuxWStream(SkWStream* const streamArray[], size_t count);
     ~SkDmuxWStream();
-    virtual bool write(const void* buffer, size_t size) SK_OVERRIDE;
-    virtual void newline() SK_OVERRIDE;
-    virtual void flush() SK_OVERRIDE;
-    virtual size_t bytesWritten() const SK_OVERRIDE;
+    virtual bool write(const void* buffer, size_t size) override;
+    virtual void newline() override;
+    virtual void flush() override;
+    virtual size_t bytesWritten() const override;
 
 private:
     SkTDArray<SkWStream*> fWStreams;
diff --git a/experimental/tools/multipage_pdf_profiler.cpp b/experimental/tools/multipage_pdf_profiler.cpp
index 337db1f91a..08a32a2436 100644
--- a/experimental/tools/multipage_pdf_profiler.cpp
+++ b/experimental/tools/multipage_pdf_profiler.cpp
@@ -31,11 +31,11 @@ class NullWStream : public SkWStream {
 public:
     NullWStream() : fBytesWritten(0) {
     }
-    bool write(const void*, size_t size) SK_OVERRIDE {
+    bool write(const void*, size_t size) override {
         fBytesWritten += size;
         return true;
     }
-    size_t bytesWritten() const SK_OVERRIDE {
+    size_t bytesWritten() const override {
         return fBytesWritten;
     }
     size_t fBytesWritten;