From d7f846bdd171e4be0c05cfe61bc4446caf5c99c6 Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 19 Jun 2014 11:26:59 -0700 Subject: [PATCH] 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 --- src/ports/SkFontMgr_win_dw.cpp | 4 ++++ src/ports/SkRemotableFontMgr_win_dw.cpp | 2 ++ src/utils/win/SkDWriteFontFileStream.h | 1 + 3 files changed, 7 insertions(+) diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index eb0989a..ecca57f 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 fFactory; @@ -205,6 +208,7 @@ private: : fRefCount(1) , fFontFileLoader(SkRefComPtr(fontFileLoader)) { } + virtual ~StreamFontCollectionLoader() { } ULONG fRefCount; SkTScopedComPtr fFontFileLoader; diff --git a/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/ports/SkRemotableFontMgr_win_dw.cpp index 936ab9b..d979683 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 5a56290..ac98be6 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 fStream; -- 2.7.4