summaryrefslogtreecommitdiff
path: root/core/fxge/ge
diff options
context:
space:
mode:
authorthestig <thestig@chromium.org>2016-05-27 15:14:20 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-27 15:14:20 -0700
commit24508dff1636d80be01497e30fccd21533fc0bde (patch)
tree4ae25af19a52e3221d95a505bda42817e11ac3f0 /core/fxge/ge
parentbbff41927ecce2ff93668aa615307f548ca896eb (diff)
downloadpdfium-24508dff1636d80be01497e30fccd21533fc0bde.tar.xz
Clean up some Android/Windows code.
Review-Url: https://codereview.chromium.org/2004313007
Diffstat (limited to 'core/fxge/ge')
-rw-r--r--core/fxge/ge/fx_ge_fontmap.cpp68
-rw-r--r--core/fxge/ge/fx_ge_linux.cpp15
2 files changed, 37 insertions, 46 deletions
diff --git a/core/fxge/ge/fx_ge_fontmap.cpp b/core/fxge/ge/fx_ge_fontmap.cpp
index 7938e10984..83690c7181 100644
--- a/core/fxge/ge/fx_ge_fontmap.cpp
+++ b/core/fxge/ge/fx_ge_fontmap.cpp
@@ -6,6 +6,7 @@
#include <algorithm>
#include <limits>
+#include <utility>
#include <vector>
#include "core/fxge/fontdata/chromefontdata/chromefontdata.h"
@@ -478,8 +479,9 @@ void CFX_FontMgr::InitFTLibrary() {
FT_Err_Unimplemented_Feature;
}
-void CFX_FontMgr::SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo) {
- m_pBuiltinMapper->SetSystemFontInfo(pFontInfo);
+void CFX_FontMgr::SetSystemFontInfo(
+ std::unique_ptr<IFX_SystemFontInfo> pFontInfo) {
+ m_pBuiltinMapper->SetSystemFontInfo(std::move(pFontInfo));
}
FXFT_Face CFX_FontMgr::FindSubstFont(const CFX_ByteString& face_name,
@@ -654,35 +656,29 @@ bool CFX_FontMgr::GetBuiltinFont(size_t index,
CFX_FontMapper::CFX_FontMapper(CFX_FontMgr* mgr)
: m_bListLoaded(FALSE),
- m_pFontInfo(nullptr),
m_pFontMgr(mgr) {
m_MMFaces[0] = nullptr;
m_MMFaces[1] = nullptr;
FXSYS_memset(m_FoxitFaces, 0, sizeof(m_FoxitFaces));
}
+
CFX_FontMapper::~CFX_FontMapper() {
for (size_t i = 0; i < FX_ArraySize(m_FoxitFaces); ++i) {
if (m_FoxitFaces[i])
FXFT_Done_Face(m_FoxitFaces[i]);
}
- if (m_MMFaces[0]) {
+ if (m_MMFaces[0])
FXFT_Done_Face(m_MMFaces[0]);
- }
- if (m_MMFaces[1]) {
+ if (m_MMFaces[1])
FXFT_Done_Face(m_MMFaces[1]);
- }
- if (m_pFontInfo) {
- m_pFontInfo->Release();
- }
}
-void CFX_FontMapper::SetSystemFontInfo(IFX_SystemFontInfo* pFontInfo) {
- if (!pFontInfo) {
+
+void CFX_FontMapper::SetSystemFontInfo(
+ std::unique_ptr<IFX_SystemFontInfo> pFontInfo) {
+ if (!pFontInfo)
return;
- }
- if (m_pFontInfo) {
- m_pFontInfo->Release();
- }
- m_pFontInfo = pFontInfo;
+
+ m_pFontInfo = std::move(pFontInfo);
}
static CFX_ByteString GetStringFromTable(const uint8_t* string_ptr,
@@ -783,18 +779,13 @@ void CFX_FontMapper::AddInstalledFont(const CFX_ByteString& name, int charset) {
}
void CFX_FontMapper::LoadInstalledFonts() {
- if (!m_pFontInfo) {
- return;
- }
- if (m_bListLoaded) {
- return;
- }
- if (m_bListLoaded) {
+ if (!m_pFontInfo || m_bListLoaded)
return;
- }
+
m_pFontInfo->EnumFontList(this);
m_bListLoaded = TRUE;
}
+
CFX_ByteString CFX_FontMapper::MatchInstalledFonts(
const CFX_ByteString& norm_name) {
LoadInstalledFonts();
@@ -1253,9 +1244,9 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(uint32_t dwUnicode,
uint32_t flags,
int weight,
int italic_angle) {
- if (m_pFontInfo == NULL) {
- return NULL;
- }
+ if (!m_pFontInfo)
+ return nullptr;
+
FX_BOOL bItalic = (flags & FXFONT_ITALIC) != 0;
int PitchFamily = 0;
if (flags & FXFONT_SERIF) {
@@ -1269,9 +1260,9 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(uint32_t dwUnicode,
}
void* hFont =
m_pFontInfo->MapFontByUnicode(dwUnicode, weight, bItalic, PitchFamily);
- if (hFont == NULL) {
- return NULL;
- }
+ if (!hFont)
+ return nullptr;
+
uint32_t ttc_size = m_pFontInfo->GetFontData(hFont, 0x74746366, NULL, 0);
uint32_t font_size = m_pFontInfo->GetFontData(hFont, 0, NULL, 0);
if (font_size == 0 && ttc_size == 0) {
@@ -1289,7 +1280,7 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(uint32_t dwUnicode,
uint8_t* pFontData;
face = m_pFontMgr->GetCachedTTCFace(ttc_size, checksum,
ttc_size - font_size, pFontData);
- if (face == NULL) {
+ if (!face) {
pFontData = FX_Alloc(uint8_t, ttc_size);
if (pFontData) {
m_pFontInfo->GetFontData(hFont, 0x74746366, pFontData, ttc_size);
@@ -1302,11 +1293,11 @@ FXFT_Face CFX_FontMapper::FindSubstFontByUnicode(uint32_t dwUnicode,
m_pFontInfo->GetFaceName(hFont, SubstName);
uint8_t* pFontData;
face = m_pFontMgr->GetCachedFace(SubstName, weight, bItalic, pFontData);
- if (face == NULL) {
+ if (!face) {
pFontData = FX_Alloc(uint8_t, font_size);
if (!pFontData) {
m_pFontInfo->DeleteFont(hFont);
- return NULL;
+ return nullptr;
}
m_pFontInfo->GetFontData(hFont, 0, pFontData, font_size);
face = m_pFontMgr->AddCachedFace(SubstName, weight, bItalic, pFontData,
@@ -1361,8 +1352,9 @@ void _FTStreamClose(FXFT_Stream stream);
};
#if _FX_OS_ == _FX_ANDROID_
-IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) {
- return NULL;
+std::unique_ptr<IFX_SystemFontInfo> IFX_SystemFontInfo::CreateDefault(
+ const char** pUnused) {
+ return nullptr;
}
#endif
@@ -1377,10 +1369,6 @@ void CFX_FolderFontInfo::AddPath(const CFX_ByteStringC& path) {
m_PathList.push_back(CFX_ByteString(path));
}
-void CFX_FolderFontInfo::Release() {
- delete this;
-}
-
FX_BOOL CFX_FolderFontInfo::EnumFontList(CFX_FontMapper* pMapper) {
m_pMapper = pMapper;
for (const auto& path : m_PathList)
diff --git a/core/fxge/ge/fx_ge_linux.cpp b/core/fxge/ge/fx_ge_linux.cpp
index 0d5aff75fa..46d7146026 100644
--- a/core/fxge/ge/fx_ge_linux.cpp
+++ b/core/fxge/ge/fx_ge_linux.cpp
@@ -123,7 +123,9 @@ void* CFX_LinuxFontInfo::MapFont(int weight,
}
return FindFont(weight, bItalic, charset, pitch_family, cstr_face, !bCJK);
}
-IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUserPaths) {
+
+std::unique_ptr<IFX_SystemFontInfo> IFX_SystemFontInfo::CreateDefault(
+ const char** pUserPaths) {
CFX_LinuxFontInfo* pInfo = new CFX_LinuxFontInfo;
if (!pInfo->ParseFontCfg(pUserPaths)) {
pInfo->AddPath("/usr/share/fonts");
@@ -131,17 +133,18 @@ IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUserPaths) {
pInfo->AddPath("/usr/share/X11/fonts/TTF");
pInfo->AddPath("/usr/local/share/fonts");
}
- return pInfo;
+ return std::unique_ptr<IFX_SystemFontInfo>(pInfo);
}
+
FX_BOOL CFX_LinuxFontInfo::ParseFontCfg(const char** pUserPaths) {
- if (!pUserPaths) {
+ if (!pUserPaths)
return FALSE;
- }
- for (const char** pPath = pUserPaths; *pPath; ++pPath) {
+
+ for (const char** pPath = pUserPaths; *pPath; ++pPath)
AddPath(*pPath);
- }
return TRUE;
}
+
void CFX_GEModule::InitPlatform() {
m_pFontMgr->SetSystemFontInfo(
IFX_SystemFontInfo::CreateDefault(m_pUserFontPaths));