Remove many _CAPS structure names.

core/src/fxge/android/fpf_skiafontmgr.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/src/fxge/android/fx_fpf.h"
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 19 matching lines @@
         count) {
       return 0;
     }
   }
   return count;
 }
 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},
     {0x3918fe2d, 0xbbeeec72}, {0x3b98b31c, 0xe1633081},
     {0x3d49f40e, 0xe1633081}, {0x432c41c5, 0xe1633081},
     {0x491b6ad0, 0xe1633081}, {0x5612cab1, 0x59b9f8f1},
     {0x779ce19d, 0xc8d2e345}, {0x7cc9510b, 0x59b9f8f1},
     {0x83746053, 0xbbeeec72}, {0xaaa60c03, 0xbbeeec72},
     {0xbf85ff26, 0xe1633081}, {0xc04fe601, 0xbbeeec72},
     {0xca3812d5, 0x59b9f8f1}, {0xca383e15, 0x59b9f8f1},
     {0xcad5eaf6, 0x59b9f8f1}, {0xcb7a04c8, 0xc8d2e345},
     {0xfb4ce0de, 0xe1633081},
 };
 FX_DWORD FPF_SkiaGetSubstFont(FX_DWORD dwHash) {
   int32_t iStart = 0;
   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) {
       iStart = iMid + 1;
     } else {
       return pItem->dwSubSt;
     }
   }
   return 0;
 }
 static const FPF_SKIAFONTMAP g_SkiaSansFontMap[] = {
     {0x58c5083, 0xd5b8d10f},  {0x14ee2d13, 0xd5b8d10f},
     {0x779ce19d, 0xd5b8d10f}, {0xcb7a04c8, 0xd5b8d10f},
     {0xfb4ce0de, 0xd5b8d10f},
 };
 FX_DWORD FPF_SkiaGetSansFont(FX_DWORD dwHash) {
   int32_t iStart = 0;
   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) {
       iStart = iMid + 1;
     } else {
       return pItem->dwSubSt;
     }
   }
   return 0;
 }
@@ skipping 417 matching lines @@
   }
   if (pOS2 && (pOS2->ulCodePageRange1 & (1 << 31))) {
     pFontDesc->m_dwStyle |= FXFONT_SYMBOLIC;
   }
   pFontDesc->m_dwCharsets = FPF_SkiaGetFaceCharset(pOS2);
   pFontDesc->m_iFaceIndex = face->face_index;
   pFontDesc->m_iGlyphNum = face->num_glyphs;
 }
 void CFPF_SkiaFontMgr::OutputSystemFonts() {}
 #endif