Cleanup CFX_Font a bit.

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 31 matching lines @@
 #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();
 
   FX_BOOL 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);
 

[Tom Sepez, 2015/08/17 18:38:01]

nit: maybe kill the doublespacing between decls in this class while we're at it.

[Lei Zhang, 2015/08/18 06:10:53]

Done.

-  FX_BOOL LoadFile(IFX_FileRead* pFile);
-
   FXFT_Face GetFace() const { return m_Face; }
 
   const CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
 
   CFX_PathData* LoadGlyphPath(FX_DWORD glyph_index, int dest_width = 0);

[Tom Sepez, 2015/08/17 18:38:01]

nit: maybe kill the default argument and be explicit at the call sites if it's
not too much trouble.

[Lei Zhang, 2015/08/18 06:10:53]

There's lots of default arguments all over the place. We can deal with those
later.

 
   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 IsItalic() const;
 
-  FX_BOOL IsBold();
+  FX_BOOL IsBold() const;
 
-  FX_BOOL IsFixedWidth();
+  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();
+  FX_BOOL IsTTFont() const;
 
   FX_BOOL GetBBox(FX_RECT& bbox);
 
-  int GetHeight();
+  int GetHeight() const;
 
-  int GetULPos();
+  int GetULPos() const;
 
-  int GetULthickness();
+  int GetULthickness() const;
 
-  int GetMaxAdvanceWidth();
+  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 AdjustMMParams(int glyph_index, int width, int weight);
+
+ 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();
-
- protected:
   FX_BOOL m_bEmbedded;
   FX_BOOL m_bVertical;
-  void* m_pOwnedStream;
 };
+
 #define ENCODING_INTERNAL 0
 #define ENCODING_UNICODE 1
 
 class IFX_FontEncoding {
  public:
   virtual ~IFX_FontEncoding() {}
 
   virtual FX_DWORD GlyphFromCharCode(FX_DWORD charcode) = 0;
 
   virtual CFX_WideString UnicodeFromCharCode(FX_DWORD charcode) const = 0;
@@ skipping 301 matching lines @@
 class IFX_GSUBTable {
  public:
   static IFX_GSUBTable* Create(CFX_Font* pFont);
   virtual FX_BOOL GetVerticalGlyph(FX_DWORD glyphnum, FX_DWORD* vglyphnum) = 0;
 
  protected:
   virtual ~IFX_GSUBTable() {}
 };
 
 #endif  // CORE_INCLUDE_FXGE_FX_FONT_H_