Change CFX_Font::GetPsName() to return a CFX_ByteString.

So everyone can avoid doing Byte to WideString conversions.

Also remove CFX_GEFont::GetPsName() and deduplicate a couple of
GetPsName() calls.

Review-Url: https://codereview.chromium.org/2019173002

2 files changed, 4 insertions, 4 deletions

diff --git a/core/fxge/android/fpf_skiafont.cpp b/core/fxge/android/fpf_skiafont.cpp
index 332bfd0ca2..e3277137d0 100644
--- a/core/fxge/android/fpf_skiafont.cpp
+++ b/core/fxge/android/fpf_skiafont.cpp
@@ -49,10 +49,10 @@ CFX_ByteString CFPF_SkiaFont::GetFamilyName() {
   return CFX_ByteString(FXFT_Get_Face_Family_Name(m_Face));
 }
 
-CFX_WideString CFPF_SkiaFont::GetPsName() {
+CFX_ByteString CFPF_SkiaFont::GetPsName() {
   if (!m_Face)
-    return CFX_WideString();
-  return CFX_WideString::FromLocal(FXFT_Get_Postscript_Name(m_Face));
+    return CFX_ByteString();
+  return FXFT_Get_Postscript_Name(m_Face);
 }
 
 int32_t CFPF_SkiaFont::GetGlyphIndex(FX_WCHAR wUnicode) {
diff --git a/core/fxge/android/fpf_skiafont.h b/core/fxge/android/fpf_skiafont.h
index 59172a5385..15347b2ff3 100644
--- a/core/fxge/android/fpf_skiafont.h
+++ b/core/fxge/android/fpf_skiafont.h
@@ -28,7 +28,7 @@ class CFPF_SkiaFont {
 
   FPF_HFONT GetHandle();
   CFX_ByteString GetFamilyName();
-  CFX_WideString GetPsName();
+  CFX_ByteString GetPsName();
   uint32_t GetFontStyle() const { return m_dwStyle; }
   uint8_t GetCharset() const { return m_uCharset; }
   int32_t GetGlyphIndex(FX_WCHAR wUnicode);