Chromium Code Reviews| Index: fpdfsdk/pdfwindow/PWL_FontMap.h |
| diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h |
| index 7f347f5eb5d799d7d4f1928b2df92f625beb9074..ef0323d87c834b0dcd6f252e3b3df1b23f5e2ee3 100644 |
| --- a/fpdfsdk/pdfwindow/PWL_FontMap.h |
| +++ b/fpdfsdk/pdfwindow/PWL_FontMap.h |
| @@ -65,23 +65,12 @@ class CPWL_FontMap : public IPVT_FontMap { |
| int32_t CharCodeFromUnicode(int32_t nFontIndex, uint16_t word) override; |
| int32_t CharSetFromUnicode(uint16_t word, int32_t nOldCharset) override; |
| - void SetSystemHandler(CFX_SystemHandler* pSystemHandler); |
| int32_t GetFontMapCount() const; |
| const CPWL_FontMap_Data* GetFontMapData(int32_t nIndex) const; |
| static int32_t GetNativeCharset(); |
| CFX_ByteString GetNativeFontName(int32_t nCharset); |
| static CFX_ByteString GetDefaultFontByCharset(int32_t nCharset); |
| - |
| - CPDF_Font* AddFontToDocument(CPDF_Document* pDoc, |
| - CFX_ByteString& sFontName, |
| - uint8_t nCharset); |
| - static FX_BOOL IsStandardFont(const CFX_ByteString& sFontName); |
| - CPDF_Font* AddStandardFont(CPDF_Document* pDoc, CFX_ByteString& sFontName); |
| - CPDF_Font* AddSystemFont(CPDF_Document* pDoc, |
| - CFX_ByteString& sFontName, |
| - uint8_t nCharset); |
| - |
| static const FPDF_CharsetFontMap defaultTTFMap[]; |
| protected: |
| @@ -115,22 +104,17 @@ class CPWL_FontMap : public IPVT_FontMap { |
| int32_t nCharset = DEFAULT_CHARSET); |
| CFX_ByteString GetNativeFont(int32_t nCharset); |
| + CPDF_Font* AddFontToDocument(CPDF_Document* pDoc, |
| + CFX_ByteString& sFontName, |
| + uint8_t nCharset); |
| + FX_BOOL IsStandardFont(const CFX_ByteString& sFontName); |
| + CPDF_Font* AddStandardFont(CPDF_Document* pDoc, CFX_ByteString& sFontName); |
| + CPDF_Font* AddSystemFont(CPDF_Document* pDoc, |
| + CFX_ByteString& sFontName, |
| + uint8_t nCharset); |
| std::unique_ptr<CPDF_Document> m_pPDFDoc; |
| CFX_SystemHandler* m_pSystemHandler; |
|
Wei Li
2016/08/24 16:54:06
now it is const?
dsinclair
2016/08/24 17:47:41
Done.
|
| }; |
| -class CPWL_DocFontMap : public CPWL_FontMap { |
| - public: |
| - CPWL_DocFontMap(CFX_SystemHandler* pSystemHandler, |
| - CPDF_Document* pAttachedDoc); |
| - ~CPWL_DocFontMap() override; |
| - |
| - private: |
| - // CPWL_FontMap: |
| - CPDF_Document* GetDocument() override; |
| - |
| - CPDF_Document* m_pAttachedDoc; |
| -}; |
| - |
| #endif // FPDFSDK_PDFWINDOW_PWL_FONTMAP_H_ |