Fix up all the easy virtual ... SK_OVERRIDE cases.

src/ports/SkRemotableFontMgr_win_dw.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 "SkDataTable.h"
 #include "SkDWrite.h"
 #include "SkDWriteFontFileStream.h"
@@ skipping 94 matching lines @@
 
     /** localeNameLength must include the null terminator. */
     SkRemotableFontMgr_DirectWrite(IDWriteFontCollection* fontCollection,
                                    WCHAR* localeName, int localeNameLength)
         : fFontCollection(SkRefComPtr(fontCollection))
         , fLocaleName(localeNameLength)
     {
         memcpy(fLocaleName.get(), localeName, localeNameLength * sizeof(WCHAR));
     }
 
-    virtual SkDataTable* getFamilyNames() const SK_OVERRIDE {
+    SkDataTable* getFamilyNames() const SK_OVERRIDE {
         int count = fFontCollection->GetFontFamilyCount();
 
         SkDataTableBuilder names(1024);
         for (int index = 0; index < count; ++index) {
             SkTScopedComPtr<IDWriteFontFamily> fontFamily;
             HRNM(fFontCollection->GetFontFamily(index, &fontFamily),
                  "Could not get requested family.");
 
             SkTScopedComPtr<IDWriteLocalizedStrings> familyNames;
             HRNM(fontFamily->GetFamilyNames(&familyNames), "Could not get family names.");
@@ skipping 46 matching lines @@
             SkASSERT(false);
         }
 
         int weight = font->GetWeight();
         int width = font->GetStretch();
 
         fontId->fFontStyle = SkFontStyle(weight, width, slant);
         return S_OK;
     }
 
-    virtual SkRemotableFontIdentitySet* getIndex(int familyIndex) const SK_OVERRIDE {
+    SkRemotableFontIdentitySet* getIndex(int familyIndex) const SK_OVERRIDE {
         SkTScopedComPtr<IDWriteFontFamily> fontFamily;
         HRNM(fFontCollection->GetFontFamily(familyIndex, &fontFamily),
              "Could not get requested family.");
 
         int count = fontFamily->GetFontCount();
         SkFontIdentity* fontIds;
         SkAutoTUnref<SkRemotableFontIdentitySet> fontIdSet(
             new SkRemotableFontIdentitySet(count, &fontIds));
         for (int fontIndex = 0; fontIndex < count; ++fontIndex) {
             SkTScopedComPtr<IDWriteFont> font;
@@ skipping 37 matching lines @@
         }
 
         size_t len = wcsnlen_s(metrics.lfMessageFont.lfFaceName, LF_FACESIZE) + 1;
         if (0 != wcsncpy_s(name->reset(len), len, metrics.lfMessageFont.lfFaceName, _TRUNCATE)) {
             return E_UNEXPECTED;
         }
 
         return S_OK;
     }
 
-    virtual SkRemotableFontIdentitySet* matchName(const char familyName[]) const SK_OVERRIDE {
+    SkRemotableFontIdentitySet* matchName(const char familyName[]) const SK_OVERRIDE {
         SkSMallocWCHAR dwFamilyName;
         if (NULL == familyName) {
             HR_GENERAL(getDefaultFontFamilyName(&dwFamilyName),
                        NULL, SkRemotableFontIdentitySet::NewEmpty());
         } else {
             HR_GENERAL(sk_cstring_to_wchar(familyName, &dwFamilyName),
                        NULL, SkRemotableFontIdentitySet::NewEmpty());
         }
 
         UINT32 index;
@@ skipping 114 matching lines @@
 
         virtual HRESULT STDMETHODCALLTYPE GetPixelsPerDip(
             void* clientDrawingContext,
             FLOAT* pixelsPerDip) SK_OVERRIDE
         {
             *pixelsPerDip = 1.0f;
             return S_OK;
         }
 
         // IUnknown methods
-        virtual ULONG STDMETHODCALLTYPE AddRef() SK_OVERRIDE {
+        ULONG STDMETHODCALLTYPE AddRef() SK_OVERRIDE {
             return InterlockedIncrement(&fRefCount);
         }
 
-        virtual ULONG STDMETHODCALLTYPE Release() SK_OVERRIDE {
+        ULONG STDMETHODCALLTYPE Release() SK_OVERRIDE {
             ULONG newCount = InterlockedDecrement(&fRefCount);
             if (0 == newCount) {
                 delete this;
             }
             return newCount;
         }
 
         virtual HRESULT STDMETHODCALLTYPE QueryInterface(
             IID const& riid, void** ppvObject) SK_OVERRIDE
         {
@@ skipping 76 matching lines @@
         SkTScopedComPtr<FontFallbackRenderer> fontFallbackRenderer(
             new FontFallbackRenderer(this, character));
 
         HR_GENERAL(fallbackLayout->Draw(NULL, fontFallbackRenderer.get(), 50.0f, 50.0f),
                    "Could not draw layout with renderer.",
                    identity);
 
         return fontFallbackRenderer->FallbackIdentity();
     }
 
-    virtual SkStreamAsset* getData(int dataId) const SK_OVERRIDE {
+    SkStreamAsset* getData(int dataId) const SK_OVERRIDE {
         SkAutoMutexAcquire ama(fDataIdCacheMutex);
         if (dataId >= fDataIdCache.count()) {
             return NULL;
         }
         const DataId& id = fDataIdCache[dataId];
 
         SkTScopedComPtr<IDWriteFontFileLoader> loader;
         HRNM(id.fLoader->QueryInterface(&loader), "QuerryInterface IDWriteFontFileLoader failed");
 
         SkTScopedComPtr<IDWriteFontFileStream> fontFileStream;
@@ skipping 32 matching lines @@
     } else {
         localeNameLen = getUserDefaultLocaleNameProc(localeNameStorage, LOCALE_NAME_MAX_LENGTH);
         if (localeNameLen) {
             localeName = localeNameStorage;
         };
     }
 
     return SkNEW_ARGS(SkRemotableFontMgr_DirectWrite, (sysFontCollection.get(),
                                                        localeName, localeNameLen));
 }