Bug 1190590 - Fix MinGW cross-compile for --enable-bundled-fonts. r=jfkthame
authorArthur Edelstein <arthuredelstein@gmail.com>
Mon, 03 Aug 2015 14:59:00 -0400
changeset 256177 6a917839599778a7ac3bdf611d51e43b6fa0e966
parent 256176 28fac8d7cdde4ea36feec3d5d233ecf2e40502ab
child 256178 217d3191748f51d1daac0b6ca31cbdfa0ef5d8f6
push id29171
push usercbook@mozilla.com
push dateWed, 05 Aug 2015 11:13:29 +0000
treeherdermozilla-central@b12a261ee32e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjfkthame
bugs1190590
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1190590 - Fix MinGW cross-compile for --enable-bundled-fonts. r=jfkthame
gfx/thebes/gfxDWriteFontList.cpp
--- a/gfx/thebes/gfxDWriteFontList.cpp
+++ b/gfx/thebes/gfxDWriteFontList.cpp
@@ -1796,16 +1796,17 @@ public:
     IFACEMETHODIMP MoveNext(BOOL * hasCurrentFile);
 
     IFACEMETHODIMP GetCurrentFontFile(IDWriteFontFile ** fontFile);
 
 private:
     BundledFontFileEnumerator() = delete;
     BundledFontFileEnumerator(const BundledFontFileEnumerator&) = delete;
     BundledFontFileEnumerator& operator=(const BundledFontFileEnumerator&) = delete;
+    virtual ~BundledFontFileEnumerator() {}
 
     nsRefPtr<IDWriteFactory>      mFactory;
 
     nsCOMPtr<nsIFile>             mFontDir;
     nsCOMPtr<nsISimpleEnumerator> mEntries;
     nsCOMPtr<nsISupports>         mCurrent;
 };
 
@@ -1863,16 +1864,17 @@ public:
         IDWriteFactory *aFactory,
         const void *aCollectionKey,
         UINT32 aCollectionKeySize,
         IDWriteFontFileEnumerator **aFontFileEnumerator);
 
 private:
     BundledFontLoader(const BundledFontLoader&) = delete;
     BundledFontLoader& operator=(const BundledFontLoader&) = delete;
+    virtual ~BundledFontLoader() { }
 };
 
 IFACEMETHODIMP
 BundledFontLoader::CreateEnumeratorFromKey(
     IDWriteFactory *aFactory,
     const void *aCollectionKey,
     UINT32  aCollectionKeySize,
     IDWriteFontFileEnumerator **aFontFileEnumerator)