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

Unified Diff: core/fxge/include/fx_font.h

Issue 2053483002: Remove even more const casting from core. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Fix non-xfa build. Created 4 years, 6 months 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
« no previous file with comments | « core/fpdfdoc/include/fpdf_doc.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxge/include/fx_font.h
diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h
index 13143d518bd62ced3c1148c36e976297dd999c36..b38ecaed3335af1843995b67e0a30a6e404f4b57 100644
--- a/core/fxge/include/fx_font.h
+++ b/core/fxge/include/fx_font.h
@@ -77,8 +77,10 @@ class CFX_Font {
int italic_angle,
int CharsetCP,
FX_BOOL bVertical = FALSE);
+
FX_BOOL LoadEmbedded(const uint8_t* data, uint32_t size);
FXFT_Face GetFace() const { return m_Face; }
+ CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
#ifdef PDF_ENABLE_XFA
FX_BOOL LoadFile(IFX_FileRead* pFile,
@@ -86,11 +88,8 @@ class CFX_Font {
int* pFaceCount = nullptr);
FX_BOOL LoadClone(const CFX_Font* pFont);
- CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
void SetFace(FXFT_Face face) { m_Face = face; }
void SetSubstFont(CFX_SubstFont* subst) { m_pSubstFont = subst; }
-#else // PDF_ENABLE_XFA
- const CFX_SubstFont* GetSubstFont() const { return m_pSubstFont; }
#endif // PDF_ENABLE_XFA
CFX_PathData* LoadGlyphPath(uint32_t glyph_index, int dest_width = 0);
« no previous file with comments | « core/fpdfdoc/include/fpdf_doc.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698