Remove FXFT_ prefix from actual freetype types.

Keep the FXFT_ prefix for things we've invented.  Namely:
  FXFT_FaceRec becomes FT_FaceRec.
  FXFT_LibraryRec remains because it is not provided.
  FXFT_StreamRec is removed as previous cleanup has made it unused.

Change-Id: I9913530bbd48ac4170dabc2ff97b72795c3d07fe
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/143891
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

core/fxge/cfx_face.cpp

diff --git a/core/fxge/cfx_face.cpp b/core/fxge/cfx_face.cpp
index 0af4b62..23c0861 100644
--- a/core/fxge/cfx_face.cpp
+++ b/core/fxge/cfx_face.cpp
@@ -323,7 +323,7 @@
  public:
   FX_STACK_ALLOCATED();
 
-  ScopedFaceTransform(FXFT_FaceRec* rec, FT_Matrix* matrix) : rec_(rec) {
+  ScopedFaceTransform(FT_FaceRec* rec, FT_Matrix* matrix) : rec_(rec) {
     FT_Set_Transform(rec_, matrix, nullptr);
   }
 
@@ -333,7 +333,7 @@
   }
 
  private:
-  UnownedPtr<FXFT_FaceRec> const rec_;
+  UnownedPtr<FT_FaceRec> const rec_;
 };
 
 }  // namespace
@@ -343,7 +343,7 @@
                                   RetainPtr<Retainable> desc,
                                   pdfium::span<const uint8_t> data,
                                   uint32_t face_index) {
-  FXFT_FaceRec* face_rec = nullptr;
+  FT_FaceRec* face_rec = nullptr;
   if (FT_New_Memory_Face(font_mgr->GetFTLibrary(), data.data(),
                          pdfium::checked_cast<FT_Long>(data.size()),
                          pdfium::checked_cast<FT_Long>(face_index),
@@ -534,7 +534,7 @@
   if (!IsTtOt()) {
     load_flags |= FT_LOAD_NO_HINTING;
   }
-  FXFT_FaceRec* rec = GetRec();
+  FT_FaceRec* rec = GetRec();
   int error = FT_Load_Glyph(rec, glyph_index, load_flags);
   if (error) {
     // if an error is returned, try to reload glyphs without hinting.
@@ -627,7 +627,7 @@
     int dest_width,
     bool is_vertical,
     const CFX_SubstFont* subst_font) {
-  FXFT_FaceRec* rec = GetRec();
+  FT_FaceRec* rec = GetRec();
   FT_Set_Pixel_Sizes(rec, 0, 64);
   FT_Matrix ft_matrix = {65536, 0, 0, 65536};
   if (subst_font) {
@@ -701,7 +701,7 @@
     AdjustVariationParams(glyph_index, dest_width, weight);
   }
 
-  FXFT_FaceRec* rec = GetRec();
+  FT_FaceRec* rec = GetRec();
   int err = FT_Load_Glyph(
       rec, glyph_index, FT_LOAD_NO_SCALE | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
   if (err) {
@@ -792,7 +792,7 @@
 
 FX_RECT CFX_Face::GetCharBBox(uint32_t code, int glyph_index) {
   FX_RECT rect;
-  FXFT_FaceRec* rec = GetRec();
+  FT_FaceRec* rec = GetRec();
   if (IsTricky()) {
     int err =
         FT_Load_Glyph(rec, glyph_index, FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH);
@@ -937,7 +937,7 @@
 }
 #endif
 
-CFX_Face::CFX_Face(FXFT_FaceRec* rec, RetainPtr<Retainable> pDesc)
+CFX_Face::CFX_Face(FT_FaceRec* rec, RetainPtr<Retainable> pDesc)
     : rec_(rec), desc_(std::move(pDesc)) {
   DCHECK(rec_);
 }
@@ -949,7 +949,7 @@
                                      int weight) {
   DCHECK_GE(dest_width, 0);
 
-  FXFT_FaceRec* rec = GetRec();
+  FT_FaceRec* rec = GetRec();
   ScopedFXFTMMVar variation_desc(rec);
   if (!variation_desc) {
     return;

core/fxge/cfx_face.h

diff --git a/core/fxge/cfx_face.h b/core/fxge/cfx_face.h
index 450497f0..cbb156f 100644
--- a/core/fxge/cfx_face.h
+++ b/core/fxge/cfx_face.h
@@ -145,11 +145,11 @@
   bool HasFaceRec() const { return !!GetRec(); }
 
  private:
-  CFX_Face(FXFT_FaceRec* pRec, RetainPtr<Retainable> pDesc);
+  CFX_Face(FT_FaceRec* pRec, RetainPtr<Retainable> pDesc);
   ~CFX_Face() override;
 
-  FXFT_FaceRec* GetRec() { return rec_.get(); }
-  const FXFT_FaceRec* GetRec() const { return rec_.get(); }
+  FT_FaceRec* GetRec() { return rec_.get(); }
+  const FT_FaceRec* GetRec() const { return rec_.get(); }
 
   bool IsTricky() const;
   void AdjustVariationParams(int glyph_index, int dest_width, int weight);

core/fxge/freetype/fx_freetype.cpp

diff --git a/core/fxge/freetype/fx_freetype.cpp b/core/fxge/freetype/fx_freetype.cpp
index 71d4ce7..89b96ba 100644
--- a/core/fxge/freetype/fx_freetype.cpp
+++ b/core/fxge/freetype/fx_freetype.cpp
@@ -63,7 +63,7 @@
   return false;
 }
 
-FT_MM_Var* GetVariationDescriptor(FXFT_FaceRec* face) {
+FT_MM_Var* GetVariationDescriptor(FT_FaceRec* face) {
   FT_MM_Var* variation_desc = nullptr;
   FT_Get_MM_Var(face, &variation_desc);
   return variation_desc;
@@ -87,7 +87,7 @@
                  variation_desc);
 }
 
-ScopedFXFTMMVar::ScopedFXFTMMVar(FXFT_FaceRec* face)
+ScopedFXFTMMVar::ScopedFXFTMMVar(FT_FaceRec* face)
     : variation_desc_(GetVariationDescriptor(face)),
       axis_(GetVariationAxis(variation_desc_.get())) {}
 

core/fxge/freetype/fx_freetype.h

diff --git a/core/fxge/freetype/fx_freetype.h b/core/fxge/freetype/fx_freetype.h
index f48c124..914d702 100644
--- a/core/fxge/freetype/fx_freetype.h
+++ b/core/fxge/freetype/fx_freetype.h
@@ -21,11 +21,9 @@
 #include FT_TRUETYPE_TABLES_H
 
 using FXFT_LibraryRec = struct FT_LibraryRec_;
-using FXFT_FaceRec = struct FT_FaceRec_;
-using FXFT_StreamRec = struct FT_StreamRec_;
 
 struct FXFTFaceRecDeleter {
-  inline void operator()(FXFT_FaceRec* pRec) { FT_Done_Face(pRec); }
+  inline void operator()(FT_FaceRec* pRec) { FT_Done_Face(pRec); }
 };
 
 struct FXFTLibraryRecDeleter {
@@ -36,13 +34,13 @@
   void operator()(FT_MM_Var* variation_desc);
 };
 
-using ScopedFXFTFaceRec = std::unique_ptr<FXFT_FaceRec, FXFTFaceRecDeleter>;
+using ScopedFXFTFaceRec = std::unique_ptr<FT_FaceRec, FXFTFaceRecDeleter>;
 using ScopedFXFTLibraryRec =
     std::unique_ptr<FXFT_LibraryRec, FXFTLibraryRecDeleter>;
 
 class ScopedFXFTMMVar {
  public:
-  explicit ScopedFXFTMMVar(FXFT_FaceRec* face);
+  explicit ScopedFXFTMMVar(FT_FaceRec* face);
   ~ScopedFXFTMMVar();
 
   explicit operator bool() const { return !!variation_desc_; }