Bug 1674228 - Rename some functions to avoid a gcc false-positive warnings.

MANUAL PUSH: GCC build bustage on a CLOSED TREE

gfx/thebes/gfxFT2FontBase.cpp

@@ -84,12 +84,12 @@ static FT_ULong GetTableSizeFromFTFace(SharedFTFace* aFace,
   return len;
 }
 
-bool gfxFT2FontEntryBase::HasFontTable(SharedFTFace* aFace,
+bool gfxFT2FontEntryBase::FaceHasTable(SharedFTFace* aFace,
                                        uint32_t aTableTag) {
   return GetTableSizeFromFTFace(aFace, aTableTag) > 0;
 }
 
-nsresult gfxFT2FontEntryBase::CopyFontTable(SharedFTFace* aFace,
+nsresult gfxFT2FontEntryBase::CopyFaceTable(SharedFTFace* aFace,
                                             uint32_t aTableTag,
                                             nsTArray<uint8_t>& aBuffer) {
   FT_ULong length = GetTableSizeFromFTFace(aFace, aTableTag);

gfx/thebes/gfxFT2FontBase.h

@@ -27,8 +27,8 @@ class gfxFT2FontEntryBase : public gfxFontEntry {
 
   CmapCacheSlot* GetCmapCacheSlot(uint32_t aCharCode);
 
-  static bool HasFontTable(mozilla::gfx::SharedFTFace*, uint32_t aTableTag);
-  static nsresult CopyFontTable(mozilla::gfx::SharedFTFace*, uint32_t aTableTag,
+  static bool FaceHasTable(mozilla::gfx::SharedFTFace*, uint32_t aTableTag);
+  static nsresult CopyFaceTable(mozilla::gfx::SharedFTFace*, uint32_t aTableTag,
                                 nsTArray<uint8_t>&);
 
  private:

gfx/thebes/gfxFT2FontList.cpp

@@ -421,13 +421,13 @@ nsresult FT2FontEntry::ReadCMAP(FontInfoData* aFontInfoData) {
 
 bool FT2FontEntry::HasFontTable(uint32_t aTableTag) {
   RefPtr<SharedFTFace> face = GetFTFace();
-  return gfxFT2FontEntryBase::HasFontTable(face, aTableTag);
+  return gfxFT2FontEntryBase::FaceHasTable(face, aTableTag);
 }
 
 nsresult FT2FontEntry::CopyFontTable(uint32_t aTableTag,
                                      nsTArray<uint8_t>& aBuffer) {
   RefPtr<SharedFTFace> face = GetFTFace();
-  return gfxFT2FontEntryBase::CopyFontTable(face, aTableTag, aBuffer);
+  return gfxFT2FontEntryBase::CopyFaceTable(face, aTableTag, aBuffer);
 }
 
 hb_blob_t* FT2FontEntry::GetFontTable(uint32_t aTableTag) {

gfx/thebes/gfxFcPlatformFontList.cpp

@@ -457,7 +457,7 @@ bool gfxFontconfigFontEntry::HasFontTable(uint32_t aTableTag) {
   if (FTUserFontData* ufd = GetUserFontData()) {
     return !!gfxFontUtils::FindTableDirEntry(ufd->FontData(), aTableTag);
   }
-  return gfxFT2FontEntryBase::HasFontTable(GetFTFace(), aTableTag);
+  return gfxFT2FontEntryBase::FaceHasTable(GetFTFace(), aTableTag);
 }
 
 hb_blob_t* gfxFontconfigFontEntry::GetFontTable(uint32_t aTableTag) {
@@ -957,7 +957,7 @@ nsresult gfxFontconfigFontEntry::CopyFontTable(uint32_t aTableTag,
                                                nsTArray<uint8_t>& aBuffer) {
   NS_ASSERTION(!mIsDataUserFont,
                "data fonts should be reading tables directly from memory");
-  return gfxFT2FontEntryBase::CopyFontTable(GetFTFace(), aTableTag, aBuffer);
+  return gfxFT2FontEntryBase::CopyFaceTable(GetFTFace(), aTableTag, aBuffer);
 }
 
 void gfxFontconfigFontFamily::FindStyleVariations(FontInfoData* aFontInfoData) {