From 60830ae5a056601dec5eb3c9a9589e29cfc9e041 Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Wed, 27 Sep 2017 13:33:57 -0400
Subject: Hide FaceFontInfo inside CFX_FolderFontInfo

This CL moves CFX_FaceFontInfo to be a protected inner class of
CFX_FolderFontInfo.

Change-Id: I3674c36d5295307be253e04337c22d6d0608fefe
Reviewed-on: https://pdfium-review.googlesource.com/14952
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
---
 core/fxge/cfx_folderfontinfo.h | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'core/fxge/cfx_folderfontinfo.h')

diff --git a/core/fxge/cfx_folderfontinfo.h b/core/fxge/cfx_folderfontinfo.h
index 1123185d69..23c20d52d2 100644
--- a/core/fxge/cfx_folderfontinfo.h
+++ b/core/fxge/cfx_folderfontinfo.h
@@ -47,6 +47,23 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
   bool GetFontCharset(void* hFont, int* charset) override;
 
  protected:
+  class FontFaceInfo {
+   public:
+    FontFaceInfo(ByteString filePath,
+                 ByteString faceName,
+                 ByteString fontTables,
+                 uint32_t fontOffset,
+                 uint32_t fileSize);
+
+    const ByteString m_FilePath;
+    const ByteString m_FaceName;
+    const ByteString m_FontTables;
+    const uint32_t m_FontOffset;
+    const uint32_t m_FileSize;
+    uint32_t m_Styles;
+    uint32_t m_Charsets;
+  };
+
   void ScanPath(const ByteString& path);
   void ScanFile(const ByteString& path);
   void ReportFace(const ByteString& path,
@@ -61,7 +78,7 @@ class CFX_FolderFontInfo : public IFX_SystemFontInfo {
                  const char* family,
                  bool bMatchName);
 
-  std::map<ByteString, std::unique_ptr<CFX_FontFaceInfo>> m_FontList;
+  std::map<ByteString, std::unique_ptr<FontFaceInfo>> m_FontList;
   std::vector<ByteString> m_PathList;
   UnownedPtr<CFX_FontMapper> m_pMapper;
 };
-- 
cgit v1.2.3