Remove CFPF_SkiaFontDescriptor.

CFPF_SkiaFontDescriptor only has a single subclass. Merge it with the
subclass.

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

1 files changed, 3 insertions, 3 deletions

diff --git a/core/fxge/android/cfpf_skiafontmgr.h b/core/fxge/android/cfpf_skiafontmgr.h
index 3152a3592e..af2d3acfc8 100644
--- a/core/fxge/android/cfpf_skiafontmgr.h
+++ b/core/fxge/android/cfpf_skiafontmgr.h
@@ -16,7 +16,7 @@
 #define FPF_MATCHFONT_REPLACEANSI 1
 
 class CFPF_SkiaFont;
-class CFPF_SkiaFontDescriptor;
+class CFPF_SkiaPathFont;
 
 class CFPF_SkiaFontMgr {
  public:
@@ -35,11 +35,11 @@ class CFPF_SkiaFontMgr {
  private:
   void ScanPath(const ByteString& path);
   void ScanFile(const ByteString& file);
-  void ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor* pFontDesc);
+  void ReportFace(FXFT_Face face, CFPF_SkiaPathFont* pFont);
 
   bool m_bLoaded = false;
   FXFT_Library m_FTLibrary = nullptr;
-  std::vector<CFPF_SkiaFontDescriptor*> m_FontFaces;
+  std::vector<CFPF_SkiaPathFont*> m_FontFaces;
   std::map<uint32_t, CFPF_SkiaFont*> m_FamilyFonts;
 };