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, 10 insertions, 10 deletions

diff --git a/core/fxge/android/cfpf_skiapathfont.h b/core/fxge/android/cfpf_skiapathfont.h
index 6cba42acff..e1d8994768 100644
--- a/core/fxge/android/cfpf_skiapathfont.h
+++ b/core/fxge/android/cfpf_skiapathfont.h
@@ -8,21 +8,21 @@
 #define CORE_FXGE_ANDROID_CFPF_SKIAPATHFONT_H_
 
 #include "core/fxcrt/fx_system.h"
-#include "core/fxge/android/cfpf_skiafontdescriptor.h"
 
-#define FPF_SKIAFONTTYPE_Path 1
-
-class CFPF_SkiaPathFont : public CFPF_SkiaFontDescriptor {
+class CFPF_SkiaPathFont {
  public:
   CFPF_SkiaPathFont();
-  ~CFPF_SkiaPathFont() override;
-
-  // CFPF_SkiaFontDescriptor
-  int32_t GetType() const override;
+  ~CFPF_SkiaPathFont();
 
   void SetPath(const char* pPath);
-
-  char* m_pPath;
+  void SetFamily(const char* pFamily);
+
+  char* m_pPath = nullptr;
+  char* m_pFamily = nullptr;
+  uint32_t m_dwStyle = 0;
+  int32_t m_iFaceIndex = 0;
+  uint32_t m_dwCharsets = 0;
+  int32_t m_iGlyphNum = 0;
 };
 
 #endif  // CORE_FXGE_ANDROID_CFPF_SKIAPATHFONT_H_