From d74da7bb34abdae254df64ba2c0da7a581f6dae0 Mon Sep 17 00:00:00 2001
From: Lei Zhang <thestig@chromium.org>
Date: Thu, 4 May 2017 13:30:29 -0700
Subject: Make CPDF_Font member variables protected.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I5d452ea907f4d243645ddae3512776096a827522
Reviewed-on: https://pdfium-review.googlesource.com/4872
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
---
 core/fpdfapi/font/cpdf_font.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'core/fpdfapi/font/cpdf_font.h')

diff --git a/core/fpdfapi/font/cpdf_font.h b/core/fpdfapi/font/cpdf_font.h
index de29db6e13..be1d91319e 100644
--- a/core/fpdfapi/font/cpdf_font.h
+++ b/core/fpdfapi/font/cpdf_font.h
@@ -78,9 +78,10 @@ class CPDF_Font {
   virtual int GetCharWidthF(uint32_t charcode) = 0;
   virtual FX_RECT GetCharBBox(uint32_t charcode) = 0;
 
-  CPDF_Document* m_pDocument;
-  CFX_Font m_Font;
-  std::vector<std::unique_ptr<CFX_Font>> m_FontFallbacks;
+  CPDF_Document* GetDocument() { return m_pDocument; }
+  CFX_Font* GetFont() { return &m_Font; }
+  const CFX_Font* GetFont() const { return &m_Font; }
+  CFX_Font* GetFontFallback(int position);
 
  protected:
   CPDF_Font();
@@ -100,6 +101,9 @@ class CPDF_Font {
                                const std::vector<CFX_ByteString>& charnames,
                                int charcode);
 
+  CPDF_Document* m_pDocument;
+  CFX_Font m_Font;
+  std::vector<std::unique_ptr<CFX_Font>> m_FontFallbacks;
   CFX_ByteString m_BaseFont;
   CFX_RetainPtr<CPDF_StreamAcc> m_pFontFile;
   CPDF_Dictionary* m_pFontDict;
-- 
cgit v1.2.3