From 01b67ed9b441cd485997bc08482def1f2ab265db Mon Sep 17 00:00:00 2001 From: npm Date: Mon, 12 Sep 2016 13:38:52 -0700 Subject: Refactor CPDF_Document by creating new methods - Methods GetPagesDict, ProcessNonbCJK, CalculateFlags, and CalculateEncodingDict created to reduce duplicated code. - Code nits Review-Url: https://codereview.chromium.org/2323793003 --- core/fxge/ge/cfx_font.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'core/fxge/ge') diff --git a/core/fxge/ge/cfx_font.cpp b/core/fxge/ge/cfx_font.cpp index 3d2e6d6499..feea8b0aa1 100644 --- a/core/fxge/ge/cfx_font.cpp +++ b/core/fxge/ge/cfx_font.cpp @@ -446,30 +446,27 @@ FX_BOOL CFX_Font::GetGlyphBBox(uint32_t glyph_index, FX_RECT& bbox) { return TRUE; } -FX_BOOL CFX_Font::IsItalic() const { +bool CFX_Font::IsItalic() const { if (!m_Face) - return FALSE; + return false; - FX_BOOL ret = FXFT_Is_Face_Italic(m_Face) == FXFT_STYLE_FLAG_ITALIC; - if (!ret) { - CFX_ByteString str(FXFT_Get_Face_Style_Name(m_Face)); - str.MakeLower(); - if (str.Find("italic") != -1) - ret = TRUE; - } - return ret; + if (FXFT_Is_Face_Italic(m_Face) == FXFT_STYLE_FLAG_ITALIC) + return true; + CFX_ByteString str(FXFT_Get_Face_Style_Name(m_Face)); + str.MakeLower(); + return str.Find("italic") != -1; } -FX_BOOL CFX_Font::IsBold() const { +bool CFX_Font::IsBold() const { if (!m_Face) - return FALSE; + return false; return FXFT_Is_Face_Bold(m_Face) == FXFT_STYLE_FLAG_BOLD; } -FX_BOOL CFX_Font::IsFixedWidth() const { +bool CFX_Font::IsFixedWidth() const { if (!m_Face) - return FALSE; - return FXFT_Is_Face_fixedwidth(m_Face); + return false; + return FXFT_Is_Face_fixedwidth(m_Face) != 0; } CFX_ByteString CFX_Font::GetPsName() const { -- cgit v1.2.3