diff options
| author |  bungeman <bungeman@google.com> | 2014-06-19 11:26:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-19 11:26:59 -0700 |
| commit | d7f846bdd171e4be0c05cfe61bc4446caf5c99c6 (patch) | |
| tree | e490c7563ee47bb37e238c4d171a0a507f3a39ad | |
| parent | 0f9bad01b0e7ad592ffb342dcf1d238b15329be1 (diff) | |
Add needed virtual destructors.
These were found by the clang on Windows build.
R=mtklein@google.com
Author: bungeman@google.com
Review URL: https://codereview.chromium.org/328303005
| -rw-r--r-- | src/ports/SkFontMgr_win_dw.cpp | 4 | ||||
| -rw-r--r-- | src/ports/SkRemotableFontMgr_win_dw.cpp | 2 | ||||
| -rw-r--r-- | src/utils/win/SkDWriteFontFileStream.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index eb0989a829..ecca57ff51 100644 --- a/src/ports/SkFontMgr_win_dw.cpp +++ b/src/ports/SkFontMgr_win_dw.cpp @@ -46,6 +46,7 @@ public: private: StreamFontFileLoader(SkStream* stream) : fRefCount(1), fStream(SkRef(stream)) { } + virtual ~StreamFontFileLoader() { } ULONG fRefCount; }; @@ -107,6 +108,8 @@ public: } private: StreamFontFileEnumerator(IDWriteFactory* factory, IDWriteFontFileLoader* fontFileLoader); + virtual ~StreamFontFileEnumerator() { } + ULONG fRefCount; SkTScopedComPtr<IDWriteFactory> fFactory; @@ -205,6 +208,7 @@ private: : fRefCount(1) , fFontFileLoader(SkRefComPtr(fontFileLoader)) { } + virtual ~StreamFontCollectionLoader() { } ULONG fRefCount; SkTScopedComPtr<IDWriteFontFileLoader> fFontFileLoader; diff --git a/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/ports/SkRemotableFontMgr_win_dw.cpp index 936ab9b831..d979683273 100644 --- a/src/ports/SkRemotableFontMgr_win_dw.cpp +++ b/src/ports/SkRemotableFontMgr_win_dw.cpp @@ -290,6 +290,8 @@ public: fIdentity.fDataId = SkFontIdentity::kInvalidDataId; } + virtual ~FontFallbackRenderer() { } + // IDWriteTextRenderer methods virtual HRESULT STDMETHODCALLTYPE DrawGlyphRun( void* clientDrawingContext, diff --git a/src/utils/win/SkDWriteFontFileStream.h b/src/utils/win/SkDWriteFontFileStream.h index 5a56290c14..ac98be6142 100644 --- a/src/utils/win/SkDWriteFontFileStream.h +++ b/src/utils/win/SkDWriteFontFileStream.h @@ -68,6 +68,7 @@ public: private: explicit SkDWriteFontFileStreamWrapper(SkStream* stream); + virtual ~SkDWriteFontFileStreamWrapper() { } ULONG fRefCount; SkAutoTUnref<SkStream> fStream; |