Bug 1528758 - No need for a null-check before calling hb_*_destroy functions, as they do it internally. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D20177

--HG--
extra : moz-landing-system : lando

gfx/thebes/gfxFontEntry.cpp

@@ -118,13 +118,8 @@ gfxFontEntry::gfxFontEntry(const nsACString& aName, bool aIsStandardFace)
 gfxFontEntry::~gfxFontEntry() {
   // Should not be dropped by stylo
   MOZ_ASSERT(NS_IsMainThread());
-  if (mCOLR) {
-    hb_blob_destroy(mCOLR);
-  }
-
-  if (mCPAL) {
-    hb_blob_destroy(mCPAL);
-  }
+  hb_blob_destroy(mCOLR);
+  hb_blob_destroy(mCPAL);
 
   // For downloaded fonts, we need to tell the user font cache that this
   // entry is being deleted.
@@ -468,7 +463,7 @@ void gfxFontEntry::FontTableHashEntry::Clear() {
   if (mSharedBlobData) {
     mSharedBlobData->ForgetHashEntry();
     mSharedBlobData = nullptr;
-  } else if (mBlob) {
+  } else {
     hb_blob_destroy(mBlob);
   }
   mBlob = nullptr;

gfx/thebes/gfxFontEntry.h

@@ -267,9 +267,7 @@ class gfxFontEntry {
       mBlob = aFontEntry->GetFontTable(aTag);
     }
     ~AutoTable() {
-      if (mBlob) {
-        hb_blob_destroy(mBlob);
-      }
+      hb_blob_destroy(mBlob);
     }
     operator hb_blob_t*() const { return mBlob; }
 

gfx/thebes/gfxFontUtils.cpp

@@ -1770,9 +1770,7 @@ void gfxFontUtils::GetVariationInstances(
     explicit AutoHBBlob(hb_blob_t* aBlob) : mBlob(aBlob) {}
 
     ~AutoHBBlob() {
-      if (mBlob) {
-        hb_blob_destroy(mBlob);
-      }
+      hb_blob_destroy(mBlob);
     }
 
     operator hb_blob_t*() { return mBlob; }

gfx/thebes/gfxHarfBuzzShaper.cpp

@@ -66,36 +66,17 @@ gfxHarfBuzzShaper::gfxHarfBuzzShaper(gfxFont *aFont)
       mLocaLongOffsets(false) {}
 
 gfxHarfBuzzShaper::~gfxHarfBuzzShaper() {
-  if (mCmapTable) {
-    hb_blob_destroy(mCmapTable);
-  }
-  if (mHmtxTable) {
-    hb_blob_destroy(mHmtxTable);
-  }
-  if (mKernTable) {
-    hb_blob_destroy(mKernTable);
-  }
-  if (mVmtxTable) {
-    hb_blob_destroy(mVmtxTable);
-  }
-  if (mVORGTable) {
-    hb_blob_destroy(mVORGTable);
-  }
-  if (mLocaTable) {
-    hb_blob_destroy(mLocaTable);
-  }
-  if (mGlyfTable) {
-    hb_blob_destroy(mGlyfTable);
-  }
-  if (mHBFont) {
-    hb_font_destroy(mHBFont);
-  }
-  if (mHBFace) {
-    hb_face_destroy(mHBFace);
-  }
-  if (mBuffer) {
-    hb_buffer_destroy(mBuffer);
-  }
+  // hb_*_destroy functions are safe to call on nullptr
+  hb_blob_destroy(mCmapTable);
+  hb_blob_destroy(mHmtxTable);
+  hb_blob_destroy(mKernTable);
+  hb_blob_destroy(mVmtxTable);
+  hb_blob_destroy(mVORGTable);
+  hb_blob_destroy(mLocaTable);
+  hb_blob_destroy(mGlyfTable);
+  hb_font_destroy(mHBFont);
+  hb_face_destroy(mHBFace);
+  hb_buffer_destroy(mBuffer);
 }
 
 #define UNICODE_BMP_LIMIT 0x10000

gfx/thebes/gfxMacPlatformFontList.h

@@ -40,9 +40,7 @@ class MacOSFontEntry : public gfxFontEntry {
                  SlantStyleRange aStyle, bool aIsDataUserFont, bool aIsLocal);
 
   virtual ~MacOSFontEntry() {
-    if (mTrakTable) {
-      hb_blob_destroy(mTrakTable);
-    }
+    hb_blob_destroy(mTrakTable);
     ::CGFontRelease(mFontRef);
   }