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

src/fonts/SkFontMgr_indirect.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 "SkFontMgr_indirect.h"
 
 #include "SkDataTable.h"
 #include "SkFontStyle.h"
 #include "SkOnce.h"
 #include "SkStream.h"
 #include "SkTSearch.h"
 #include "SkTypeface.h"
 
 class SkData;
 class SkString;
 
 class SkStyleSet_Indirect : public SkFontStyleSet {
 public:
     /** Takes ownership of the SkRemotableFontIdentitySet. */
     SkStyleSet_Indirect(const SkFontMgr_Indirect* owner, int familyIndex,
                         SkRemotableFontIdentitySet* data)
         : fOwner(SkRef(owner)), fFamilyIndex(familyIndex), fData(data)
     { }
 
-    int count() SK_OVERRIDE { return fData->count(); }
+    int count() override { return fData->count(); }
 
-    void getStyle(int index, SkFontStyle* fs, SkString* style) SK_OVERRIDE {
+    void getStyle(int index, SkFontStyle* fs, SkString* style) override {
         if (fs) {
             *fs = fData->at(index).fFontStyle;
         }
         if (style) {
             // TODO: is this useful? Current locale?
             style->reset();
         }
     }
 
-    SkTypeface* createTypeface(int index) SK_OVERRIDE {
+    SkTypeface* createTypeface(int index) override {
         return fOwner->createTypefaceFromFontId(fData->at(index));
     }
 
-    SkTypeface* matchStyle(const SkFontStyle& pattern) SK_OVERRIDE {
+    SkTypeface* matchStyle(const SkFontStyle& pattern) override {
         if (fFamilyIndex >= 0) {
             SkFontIdentity id = fOwner->fProxy->matchIndexStyle(fFamilyIndex, pattern);
             return fOwner->createTypefaceFromFontId(id);
         }
 
         // If this SkStyleSet was created via onMatchFamily we would need a call like
         // fOwner->fProxy->matchNameStyle(fFamilyName, pattern);
         // but would not activate fonts (only consider fonts which would come back from matchName).
 
         // CSS policy sounds good.
@@ skipping 235 matching lines @@
         face.reset(this->matchFamilyStyle(NULL, style));
     }
 
     if (NULL == face.get()) {
         SkFontIdentity fontId = this->fProxy->matchIndexStyle(0, style);
         face.reset(this->createTypefaceFromFontId(fontId));
     }
 
     return face.detach();
 }