Bug 1382857 Part 1: Move FontInfoData constructor out of inline, creating a vtable needed for clang compilation. draft
authorBrad Werth <bwerth@mozilla.com>
Thu, 20 Jul 2017 15:37:52 -0700
changeset 642157 2aafe0e23cdb23920c34db2392042e815f8504c3
parent 641632 47248637eafa9a38dade8dc3aa6c4736177c8d8d
child 642158 f87f22fa95ff3d03023ae5674f28edd01dd75419
child 642256 f6cd03c8d42b0cc189a632ef175c6c372c4ab6c0
push id72664
push userbwerth@mozilla.com
push dateMon, 07 Aug 2017 19:42:56 +0000
bugs1382857
milestone57.0a1
Bug 1382857 Part 1: Move FontInfoData constructor out of inline, creating a vtable needed for clang compilation. MozReview-Commit-ID: 7OsuYxF0rM3
gfx/thebes/gfxFontInfoLoader.cpp
gfx/thebes/gfxFontInfoLoader.h
--- a/gfx/thebes/gfxFontInfoLoader.cpp
+++ b/gfx/thebes/gfxFontInfoLoader.cpp
@@ -13,16 +13,27 @@ using namespace mozilla;
 using services::GetObserverService;
 
 #define LOG_FONTINIT(args) MOZ_LOG(gfxPlatform::GetLog(eGfxLog_fontinit), \
                                LogLevel::Debug, args)
 #define LOG_FONTINIT_ENABLED() MOZ_LOG_TEST( \
                                    gfxPlatform::GetLog(eGfxLog_fontinit), \
                                    LogLevel::Debug)
 
+FontInfoData::FontInfoData(bool aLoadOtherNames,
+                           bool aLoadFaceNames,
+                           bool aLoadCmaps) :
+    mCanceled(false),
+    mLoadOtherNames(aLoadOtherNames),
+    mLoadFaceNames(aLoadFaceNames),
+    mLoadCmaps(aLoadCmaps)
+{
+    MOZ_COUNT_CTOR(FontInfoData);
+}
+
 void
 FontInfoData::Load()
 {
     TimeStamp start = TimeStamp::Now();
 
     uint32_t i, n = mFontFamiliesToLoad.Length();
     mLoadStats.families = n;
     for (i = 0; i < n && !mCanceled; i++) {
--- a/gfx/thebes/gfxFontInfoLoader.h
+++ b/gfx/thebes/gfxFontInfoLoader.h
@@ -46,24 +46,17 @@ struct FontFaceData {
 // harfbuzz API methods within FontInfoData subclasses.
 
 class FontInfoData {
 public:
     NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FontInfoData)
 
     FontInfoData(bool aLoadOtherNames,
                  bool aLoadFaceNames,
-                 bool aLoadCmaps) :
-        mCanceled(false),
-        mLoadOtherNames(aLoadOtherNames),
-        mLoadFaceNames(aLoadFaceNames),
-        mLoadCmaps(aLoadCmaps)
-    {
-        MOZ_COUNT_CTOR(FontInfoData);
-    }
+                 bool aLoadCmaps);
 
 protected:
     // Protected destructor, to discourage deletion outside of Release():
     virtual ~FontInfoData() {
         MOZ_COUNT_DTOR(FontInfoData);
     }
 
 public: