Bug 1780540 - Don't forget charmap after setting in a font entry. r=j…

…fkthame Differential Revision: https://phabricator.services.mozilla.com/D152379
dothq · Jul 21, 2022 · a829fc3 · a829fc3
1 parent 19f3d0a
commit a829fc3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/gfx/thebes/gfxDWriteFontList.cpp b/gfx/thebes/gfxDWriteFontList.cpp
@@ -567,7 +567,7 @@ nsresult gfxDWriteFontEntry::ReadCMAP(FontInfoData* aFontInfoData) {
     // Temporarily retain charmap, until the shared version is
     // ready for use.
     if (mCharacterMap.compareExchange(nullptr, charmap.get())) {
-      Unused << charmap.forget();
+      charmap.get()->AddRef();
     }
   }
 

diff --git a/gfx/thebes/gfxFT2FontList.cpp b/gfx/thebes/gfxFT2FontList.cpp
@@ -425,6 +425,7 @@ nsresult FT2FontEntry::ReadCMAP(FontInfoData* aFontInfoData) {
   }
   if (setCharMap) {
     if (mCharacterMap.compareExchange(nullptr, charmap.get())) {
+      // We forget rather than addref because we don't use the charmap below.
       Unused << charmap.forget();
     }
   }

diff --git a/gfx/thebes/gfxFcPlatformFontList.cpp b/gfx/thebes/gfxFcPlatformFontList.cpp
@@ -459,7 +459,7 @@ nsresult gfxFontconfigFontEntry::ReadCMAP(FontInfoData* aFontInfoData) {
   }
   if (setCharMap) {
     if (mCharacterMap.compareExchange(nullptr, charmap.get())) {
-      Unused << charmap.forget();
+      charmap.get()->AddRef();
     }
   }
 

diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp
@@ -181,7 +181,7 @@ nsresult GDIFontEntry::ReadCMAP(FontInfoData* aFontInfoData) {
     charmap->mBuildOnTheFly = true;
   }
   if (mCharacterMap.compareExchange(nullptr, charmap.get())) {
-    Unused << charmap.forget();
+    charmap.get()->AddRef();
   }
 
   LOG_FONTLIST(("(fontlist-cmap) name: %s, size: %zd hash: %8.8x%s\n",

diff --git a/gfx/thebes/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm
@@ -432,7 +432,7 @@ static void GetStringForNSString(const NSString* aSrc, nsAString& aDest) {
     // Temporarily retain charmap, until the shared version is
     // ready for use.
     if (mCharacterMap.compareExchange(nullptr, charmap.get())) {
-      Unused << charmap.forget();
+      charmap.get()->AddRef();
     }
   }