Rename GetCStr and GetPtr to match CFX_ByteString

core/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/fxcrt/include/fx_system.h"
 
 #if _FX_OS_ == _FX_ANDROID_
 
@@ skipping 158 matching lines @@
     case FXFONT_THAI_CHARSET:
       return FPF_SKIACHARSET_Thai;
     case FXFONT_EASTEUROPE_CHARSET:
       return FPF_SKIACHARSET_EeasternEuropean;
   }
   return FPF_SKIACHARSET_Default;
 }
 static uint32_t FPF_SKIANormalizeFontName(const CFX_ByteStringC& bsfamily) {
   uint32_t dwHash = 0;
   int32_t iLength = bsfamily.GetLength();
-  const FX_CHAR* pBuffer = bsfamily.GetCStr();
+  const FX_CHAR* pBuffer = bsfamily.c_str();
   for (int32_t i = 0; i < iLength; i++) {
     FX_CHAR ch = pBuffer[i];
     if (ch == ' ' || ch == '-' || ch == ',') {
       continue;
     }
     dwHash = 31 * dwHash + FXSYS_tolower(ch);
   }
   return dwHash;
 }
 static uint32_t FPF_SKIAGetFamilyHash(const CFX_ByteStringC& bsFamily,
@@ skipping 175 matching lines @@
 FXFT_Face CFPF_SkiaFontMgr::GetFontFace(const CFX_ByteStringC& bsFile,
                                         int32_t iFaceIndex) {
   if (bsFile.IsEmpty()) {
     return NULL;
   }
   if (iFaceIndex < 0) {
     return NULL;
   }
   FXFT_Open_Args args;
   args.flags = FT_OPEN_PATHNAME;
-  args.pathname = (FT_String*)bsFile.GetCStr();
+  args.pathname = static_cast<FT_String*>(bsFile.c_str());
   FXFT_Face face;
   if (FXFT_Open_Face(m_FTLibrary, &args, iFaceIndex, &face)) {
     return FALSE;
   }
   FXFT_Set_Pixel_Sizes(face, 0, 64);
   return face;
 }
 FXFT_Face CFPF_SkiaFontMgr::GetFontFace(const uint8_t* pBuffer,
                                         size_t szBuffer,
                                         int32_t iFaceIndex) {
   if (!pBuffer || szBuffer < 1) {
     return NULL;
   }
   if (iFaceIndex < 0) {
     return NULL;
   }
   FXFT_Open_Args args;
   args.flags = FT_OPEN_MEMORY;
   args.memory_base = pBuffer;
   args.memory_size = szBuffer;
   FXFT_Face face;
   if (FXFT_Open_Face(m_FTLibrary, &args, iFaceIndex, &face)) {
     return FALSE;
   }
   FXFT_Set_Pixel_Sizes(face, 0, 64);
   return face;
 }
 void CFPF_SkiaFontMgr::ScanPath(const CFX_ByteStringC& path) {
-  void* handle = FX_OpenFolder(path.GetCStr());
+  void* handle = FX_OpenFolder(path.c_str());
   if (!handle) {
     return;
   }
   CFX_ByteString filename;
   FX_BOOL bFolder = FALSE;
   while (FX_GetNextFile(handle, filename, bFolder)) {
     if (bFolder) {
       if (filename == "." || filename == "..") {
         continue;
       }
@@ skipping 12 matching lines @@
     } else {
       ScanFile(fullpath);
     }
   }
   FX_CloseFolder(handle);
 }
 void CFPF_SkiaFontMgr::ScanFile(const CFX_ByteStringC& file) {
   FXFT_Face face = GetFontFace(file);
   if (face) {
     CFPF_SkiaPathFont* pFontDesc = new CFPF_SkiaPathFont;
-    pFontDesc->SetPath(file.GetCStr());
+    pFontDesc->SetPath(file.c_str());
     ReportFace(face, pFontDesc);
     m_FontFaces.push_back(pFontDesc);
     FXFT_Done_Face(face);
   }
 }
 static const uint32_t g_FPFSkiaFontCharsets[] = {
     FPF_SKIACHARSET_Ansi,
     FPF_SKIACHARSET_EeasternEuropean,
     FPF_SKIACHARSET_Cyrillic,
     FPF_SKIACHARSET_Greek,
@@ skipping 67 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