Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: src/ports/SkRemotableFontMgr_win_dw.cpp

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/ports/SkImageDecoder_WIC.cpp ('k') | src/ports/SkScalerContext_win_dw.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkRemotableFontMgr_win_dw.cpp
diff --git a/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/ports/SkRemotableFontMgr_win_dw.cpp
index 2f02e4bcaa062a2a8dd4ff56bc48ea366427c4a3..5c3205d5238022e36ac1baa703432af31af13dce 100644
--- a/src/ports/SkRemotableFontMgr_win_dw.cpp
+++ b/src/ports/SkRemotableFontMgr_win_dw.cpp
@@ -112,7 +112,7 @@ public:
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);
@@ -179,7 +179,7 @@ public:
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.");
@@ -237,7 +237,7 @@ public:
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),
@@ -372,11 +372,11 @@ public:
}
// 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;
@@ -473,7 +473,7 @@ public:
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;
« no previous file with comments | « src/ports/SkImageDecoder_WIC.cpp ('k') | src/ports/SkScalerContext_win_dw.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698