Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / core / src / fxge / android / fpf_skiafontmgr.h
index ba9ea91..5acf14e 100644 (file)
@@ -97,16 +97,16 @@ public:
     FX_BOOL                                    InitFTLibrary();
     virtual void                       LoadSystemFonts();
     virtual void                       LoadPrivateFont(IFX_FileRead* pFontFile);
-    virtual void                       LoadPrivateFont(FX_BSTR bsFileName);
+    virtual void                       LoadPrivateFont(const CFX_ByteStringC& bsFileName);
     virtual void                       LoadPrivateFont(void* pBuffer, size_t szBuffer);
 
-    virtual IFPF_Font*         CreateFont(FX_BSTR bsFamilyname, uint8_t uCharset, FX_DWORD dwStyle, FX_DWORD dwMatch = 0);
+    virtual IFPF_Font*         CreateFont(const CFX_ByteStringC& bsFamilyname, uint8_t uCharset, FX_DWORD dwStyle, FX_DWORD dwMatch = 0);
     FXFT_Face                          GetFontFace(IFX_FileRead *pFileRead, int32_t iFaceIndex = 0);
-    FXFT_Face                          GetFontFace(FX_BSTR bsFile, int32_t iFaceIndex = 0);
+    FXFT_Face                          GetFontFace(const CFX_ByteStringC& bsFile, int32_t iFaceIndex = 0);
     FXFT_Face                          GetFontFace(const uint8_t* pBuffer, size_t szBuffer, int32_t iFaceIndex = 0);
 protected:
-    void                               ScanPath(FX_BSTR path);
-    void                               ScanFile(FX_BSTR file);
+    void                               ScanPath(const CFX_ByteStringC& path);
+    void                               ScanFile(const CFX_ByteStringC& file);
     void                               ReportFace(FXFT_Face face, CFPF_SkiaFontDescriptor *pFontDesc);
     void                               OutputSystemFonts();
     FX_BOOL                            m_bLoaded;