Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(450)

Unified Diff: xfa/fgas/font/cfgas_gefont.h

Issue 2524493002: Clean up CFGAS_GEFont (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: xfa/fgas/font/cfgas_gefont.h
diff --git a/xfa/fgas/font/fgas_gefont.h b/xfa/fgas/font/cfgas_gefont.h
similarity index 94%
rename from xfa/fgas/font/fgas_gefont.h
rename to xfa/fgas/font/cfgas_gefont.h
index 7baafefc7e878957b49fb7bb4eb4718b1d80e6ce..ae704285156720efe03006ffad3fd8b3f4a40b33 100644
--- a/xfa/fgas/font/fgas_gefont.h
+++ b/xfa/fgas/font/cfgas_gefont.h
@@ -4,8 +4,8 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef XFA_FGAS_FONT_FGAS_GEFONT_H_
-#define XFA_FGAS_FONT_FGAS_GEFONT_H_
+#ifndef XFA_FGAS_FONT_CFGAS_GEFONT_H_
+#define XFA_FGAS_FONT_CFGAS_GEFONT_H_
#include <map>
@@ -42,7 +42,6 @@ class CFGAS_GEFont {
void Release();
CFGAS_GEFont* Retain();
CFGAS_GEFont* Derive(uint32_t dwFontStyles, uint16_t wCodePage = 0);
- void GetFamilyName(CFX_WideString& wsFamily) const;
uint32_t GetFontStyles() const;
bool GetCharWidth(FX_WCHAR wUnicode, int32_t& iWidth, bool bCharCode);
int32_t GetGlyphIndex(FX_WCHAR wUnicode, bool bCharCode = false);
@@ -50,8 +49,6 @@ class CFGAS_GEFont {
int32_t GetDescent() const;
bool GetCharBBox(FX_WCHAR wUnicode, CFX_Rect& bbox, bool bCharCode = false);
bool GetBBox(CFX_Rect& bbox);
- int32_t GetItalicAngle() const;
- void Reset();
CFGAS_GEFont* GetSubstFont(int32_t iGlyphIndex) const;
CFX_Font* GetDevFont() const { return m_pFont; }
void SetFontProvider(CXFA_PDFFontMgr* pProvider) { m_pProvider = pProvider; }
@@ -62,7 +59,7 @@ class CFGAS_GEFont {
}
#endif
- protected:
+ private:
explicit CFGAS_GEFont(CFGAS_FontMgr* pFontMgr);
CFGAS_GEFont(CFGAS_GEFont* src, uint32_t dwFontStyles);
@@ -88,6 +85,7 @@ class CFGAS_GEFont {
bool bRecursive,
CFGAS_GEFont** ppFont,
bool bCharCode = false);
+ CFX_WideString GetFamilyName() const;
#if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_
bool m_bUseLogFontStyle;
@@ -111,4 +109,4 @@ class CFGAS_GEFont {
std::map<FX_WCHAR, CFGAS_GEFont*> m_FontMapper;
};
-#endif // XFA_FGAS_FONT_FGAS_GEFONT_H_
+#endif // XFA_FGAS_FONT_CFGAS_GEFONT_H_

Powered by Google App Engine
This is Rietveld 408576698