summaryrefslogtreecommitdiff
path: root/core/src/fxge/android
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2016-02-23 10:11:11 -0800
committerTom Sepez <tsepez@chromium.org>2016-02-23 10:11:11 -0800
commitd21cddaa7548584bfcebefe9a03e857fee3a846b (patch)
tree0211132f874bfc0ba36b339b4fe961331f88f036 /core/src/fxge/android
parent2eaa2ef03f7fc9417007d554ee955137fe9ff7b4 (diff)
downloadpdfium-d21cddaa7548584bfcebefe9a03e857fee3a846b.tar.xz
Remove many _CAPS structure names.
They're technically not allowed because they are reserved for the preprocessor. Also get rid of LPC* typedefs along the way. Also provide a header for a data file containing many instance of these found along the way. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1722873002 .
Diffstat (limited to 'core/src/fxge/android')
-rw-r--r--core/src/fxge/android/fpf_skiafontmgr.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp
index ce3b80506d..9c36e6c99f 100644
--- a/core/src/fxge/android/fpf_skiafontmgr.cpp
+++ b/core/src/fxge/android/fpf_skiafontmgr.cpp
@@ -37,11 +37,10 @@ static void FPF_SkiaStream_Close(FXFT_Stream stream) {}
#ifdef __cplusplus
};
#endif
-typedef struct _FPF_SKIAFONTMAP {
+struct FPF_SKIAFONTMAP {
FX_DWORD dwFamily;
FX_DWORD dwSubSt;
-} FPF_SKIAFONTMAP, *FPF_LPSKIAFONTMAP;
-typedef FPF_SKIAFONTMAP const* FPF_LPCSKIAFONTMAP;
+};
static const FPF_SKIAFONTMAP g_SkiaFontmap[] = {
{0x58c5083, 0xc8d2e345}, {0x5dfade2, 0xe1633081},
{0x684317d, 0xe1633081}, {0x14ee2d13, 0xc8d2e345},
@@ -60,7 +59,7 @@ FX_DWORD FPF_SkiaGetSubstFont(FX_DWORD dwHash) {
int32_t iEnd = sizeof(g_SkiaFontmap) / sizeof(FPF_SKIAFONTMAP);
while (iStart <= iEnd) {
int32_t iMid = (iStart + iEnd) / 2;
- FPF_LPCSKIAFONTMAP pItem = &g_SkiaFontmap[iMid];
+ const FPF_SKIAFONTMAP* pItem = &g_SkiaFontmap[iMid];
if (dwHash < pItem->dwFamily) {
iEnd = iMid - 1;
} else if (dwHash > pItem->dwFamily) {
@@ -81,7 +80,7 @@ FX_DWORD FPF_SkiaGetSansFont(FX_DWORD dwHash) {
int32_t iEnd = sizeof(g_SkiaSansFontMap) / sizeof(FPF_SKIAFONTMAP);
while (iStart <= iEnd) {
int32_t iMid = (iStart + iEnd) / 2;
- FPF_LPCSKIAFONTMAP pItem = &g_SkiaSansFontMap[iMid];
+ const FPF_SKIAFONTMAP* pItem = &g_SkiaSansFontMap[iMid];
if (dwHash < pItem->dwFamily) {
iEnd = iMid - 1;
} else if (dwHash > pItem->dwFamily) {