XFA: Manually apply changes to fpdf_text.h and fx_font.h from master

core/include/fxge/fx_font.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_INCLUDE_FXGE_FX_FONT_H_
 #define CORE_INCLUDE_FXGE_FX_FONT_H_
 
 #include <map>
@@ skipping 16 matching lines @@
 class IFX_FontEncoding;
 class IFX_SystemFontInfo;
 
 #define FXFONT_FIXED_PITCH 0x01
 #define FXFONT_SERIF 0x02
 #define FXFONT_SYMBOLIC 0x04
 #define FXFONT_SCRIPT 0x08
 #define FXFONT_ITALIC 0x40
 #define FXFONT_BOLD 0x40000
 #define FXFONT_USEEXTERNATTR 0x80000
+#define FXFONT_CIDFONT 0x100000
 #define FXFONT_EXACTMATCH 0x80000000
-#define FXFONT_CIDFONT 0x100000
 #define FXFONT_ANSI_CHARSET 0
 #define FXFONT_DEFAULT_CHARSET 1
 #define FXFONT_SYMBOL_CHARSET 2
 #define FXFONT_SHIFTJIS_CHARSET 128
 #define FXFONT_HANGEUL_CHARSET 129
 #define FXFONT_GB2312_CHARSET 134
 #define FXFONT_CHINESEBIG5_CHARSET 136
 #define FXFONT_THAI_CHARSET 222
 #define FXFONT_EASTEUROPE_CHARSET 238
 #define FXFONT_RUSSIAN_CHARSET 204
 #define FXFONT_GREEK_CHARSET 161
 #define FXFONT_TURKISH_CHARSET 162
 #define FXFONT_HEBREW_CHARSET 177
 #define FXFONT_ARABIC_CHARSET 178
 #define FXFONT_BALTIC_CHARSET 186
 #define FXFONT_FF_FIXEDPITCH 1
 #define FXFONT_FF_ROMAN (1 << 4)
 #define FXFONT_FF_SCRIPT (4 << 4)
 #define FXFONT_FW_NORMAL 400
 #define FXFONT_FW_BOLD 700
+
 class CFX_Font {
  public:
   CFX_Font();
   ~CFX_Font();
 
   void LoadSubst(const CFX_ByteString& face_name,
                  FX_BOOL bTrueType,
                  FX_DWORD flags,
                  int weight,
                  int italic_angle,
                  int CharsetCP,
                  FX_BOOL bVertical = FALSE);
   FX_BOOL LoadEmbedded(const uint8_t* data, FX_DWORD size);
 
   FX_BOOL LoadFile(IFX_FileRead* pFile,
                    int nFaceIndex = 0,
                    int* pFaceCount = NULL);
 
   FX_BOOL LoadClone(const CFX_Font* pFont);
 
   FXFT_Face GetFace() const { return m_Face; }
+  CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
+  void SetFace(FXFT_Face face) { m_Face = face; }
+  void SetSubstFont(CFX_SubstFont* subst) { m_pSubstFont = subst; }
+  CFX_PathData* LoadGlyphPath(FX_DWORD glyph_index, int dest_width = 0);
+  int GetGlyphWidth(FX_DWORD glyph_index);
+  int GetAscent() const;
+  int GetDescent() const;
+  FX_BOOL GetGlyphBBox(FX_DWORD glyph_index, FX_RECT& bbox);
+  FX_BOOL IsItalic() const;
+  FX_BOOL IsBold() const;
+  FX_BOOL IsFixedWidth() const;
+  FX_BOOL IsVertical() const { return m_bVertical; }
+  CFX_WideString GetPsName() const;
+  CFX_ByteString GetFamilyName() const;
+  CFX_ByteString GetFaceName() const;
+  FX_BOOL IsTTFont() const;
+  FX_BOOL GetBBox(FX_RECT& bbox);
+  int GetHeight() const;
+  int GetULPos() const;
+  int GetULthickness() const;
+  int GetMaxAdvanceWidth() const;
+  FX_BOOL IsEmbedded() const { return m_bEmbedded; }
+  uint8_t* GetSubData() const { return m_pGsubData; }
+  void SetSubData(uint8_t* data) { m_pGsubData = data; }
+  void* GetPlatformFont() const { return m_pPlatformFont; }
+  void SetPlatformFont(void* font) { m_pPlatformFont = font; }
+  uint8_t* GetFontData() const { return m_pFontData; }
+  FX_DWORD GetSize() const { return m_dwSize; }
+  void AdjustMMParams(int glyph_index, int width, int weight);
 
-  const CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
-
-  CFX_PathData* LoadGlyphPath(FX_DWORD glyph_index, int dest_width = 0);
-
-  int GetGlyphWidth(FX_DWORD glyph_index);
-
-  int GetAscent() const;
-
-  int GetDescent() const;
-
-  FX_BOOL GetGlyphBBox(FX_DWORD glyph_index, FX_RECT& bbox);
-
-  FX_BOOL IsItalic();
-
-  FX_BOOL IsBold();
-
-  FX_BOOL IsFixedWidth();
-
-  FX_BOOL IsVertical() const { return m_bVertical; }
-
-  CFX_WideString GetPsName() const;
-
-  CFX_ByteString GetFamilyName() const;
-
-  CFX_ByteString GetFaceName() const;
-
-  FX_BOOL IsTTFont();
-
-  FX_BOOL GetBBox(FX_RECT& bbox);
-
-  int GetHeight();
-
-  int GetULPos();
-
-  int GetULthickness();
-
-  int GetMaxAdvanceWidth();
+ private:
+  void ReleasePlatformResource();
+  void DeleteFace();
 
   FXFT_Face m_Face;
-
   CFX_SubstFont* m_pSubstFont;
-  FX_BOOL IsEmbedded() { return m_bEmbedded; }
-
-  void AdjustMMParams(int glyph_index, int width, int weight);
   uint8_t* m_pFontDataAllocation;
   uint8_t* m_pFontData;
   uint8_t* m_pGsubData;
   FX_DWORD m_dwSize;
   CFX_BinaryBuf m_OtfFontData;
   void* m_hHandle;
   void* m_pPlatformFont;
   void* m_pPlatformFontCollection;
   void* m_pDwFont;
   FX_BOOL m_bDwLoaded;
-  void ReleasePlatformResource();
-
-  void DeleteFace();
+  FX_BOOL m_bEmbedded;
+  FX_BOOL m_bVertical;
 
  protected:
-  FX_BOOL m_bEmbedded;
-  FX_BOOL m_bVertical;
   FX_BOOL m_bLogic;
   void* m_pOwnedStream;
 };
+
 #define ENCODING_INTERNAL 0
 #define ENCODING_UNICODE 1
 
 #define FXFM_ENC_TAG(a, b, c, d)                                          \
   (((FX_DWORD)(a) << 24) | ((FX_DWORD)(b) << 16) | ((FX_DWORD)(c) << 8) | \
    (FX_DWORD)(d))
 #define FXFM_ENCODING_NONE FXFM_ENC_TAG(0, 0, 0, 0)
 #define FXFM_ENCODING_MS_SYMBOL FXFM_ENC_TAG('s', 'y', 'm', 'b')
 #define FXFM_ENCODING_UNICODE FXFM_ENC_TAG('u', 'n', 'i', 'c')
 #define FXFM_ENCODING_MS_SJIS FXFM_ENC_TAG('s', 'j', 'i', 's')
@@ skipping 77 matching lines @@
 typedef struct {
   const uint8_t* m_pFontData;
   FX_DWORD m_dwSize;
 } FoxitFonts;
 class CFX_FontMgr {
  public:
   CFX_FontMgr();
   ~CFX_FontMgr();
 
   void InitFTLibrary();
+
   FXFT_Face GetCachedFace(const CFX_ByteString& face_name,
                           int weight,
                           FX_BOOL bItalic,
                           uint8_t*& pFontData);
   FXFT_Face AddCachedFace(const CFX_ByteString& face_name,
                           int weight,
                           FX_BOOL bItalic,
                           uint8_t* pData,
                           FX_DWORD size,
                           int face_index);
@@ skipping 53 matching lines @@
 
   void SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo);
   IFX_SystemFontInfo* GetSystemFontInfo() { return m_pFontInfo; }
   void AddInstalledFont(const CFX_ByteString& name, int charset);
   void LoadInstalledFonts();
   CFX_ByteStringArray m_InstalledTTFonts;
   void SetFontEnumerator(IFX_FontEnumerator* pFontEnumerator) {
     m_pFontEnumerator = pFontEnumerator;
   }
   IFX_FontEnumerator* GetFontEnumerator() const { return m_pFontEnumerator; }
-
   FXFT_Face FindSubstFont(const CFX_ByteString& face_name,
                           FX_BOOL bTrueType,
                           FX_DWORD flags,
                           int weight,
                           int italic_angle,
                           int CharsetCP,
                           CFX_SubstFont* pSubstFont);
   FXFT_Face FindSubstFontByUnicode(FX_DWORD dwUnicode,
                                    FX_DWORD flags,
                                    int weight,
@@ skipping 198 matching lines @@
 
  protected:
   virtual ~IFX_GSUBTable() {}
 };
 
 CFX_ByteString GetNameFromTT(const uint8_t* name_table, FX_DWORD name);
 
 int PDF_GetStandardFontName(CFX_ByteString* name);
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_