Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Side by Side Diff: fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h

Issue 1542373002: Fix a bad virtual keyword removal from commit 0f6b51c. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | fpdfsdk/include/pdfwindow/PWL_FontMap.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_ 7 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
8 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_ 8 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
9 9
10 #include "fpdfsdk/include/pdfwindow/PWL_FontMap.h" 10 #include "fpdfsdk/include/pdfwindow/PWL_FontMap.h"
11 11
12 class CPDF_Dictionary; 12 class CPDF_Dictionary;
13 class CPDFSDK_Annot; 13 class CPDFSDK_Annot;
14 14
15 class CBA_FontMap : public CPWL_FontMap { 15 class CBA_FontMap : public CPWL_FontMap {
16 public: 16 public:
17 CBA_FontMap(CPDFSDK_Annot* pAnnot, IFX_SystemHandler* pSystemHandler); 17 CBA_FontMap(CPDFSDK_Annot* pAnnot, IFX_SystemHandler* pSystemHandler);
18 CBA_FontMap(CPDF_Document* pDocument, 18 CBA_FontMap(CPDF_Document* pDocument,
19 CPDF_Dictionary* pAnnotDict, 19 CPDF_Dictionary* pAnnotDict,
20 IFX_SystemHandler* pSystemHandler); 20 IFX_SystemHandler* pSystemHandler);
21 21
22 ~CBA_FontMap() override; 22 ~CBA_FontMap() override;
23 23
24 virtual void Initial(const FX_CHAR* fontname = NULL); 24 void Initialize();
Tom Sepez 2015/12/25 01:11:56 Distinct from CPWL_FontMap::Init() virtual? Confu
Lei Zhang 2015/12/25 04:42:47 I made this override CPWL_FontMap::Initialize() ag
25 25
26 public:
27 void SetDefaultFont(CPDF_Font* pFont, const CFX_ByteString& sFontName); 26 void SetDefaultFont(CPDF_Font* pFont, const CFX_ByteString& sFontName);
28 27
29 void Reset(); 28 void Reset();
30 void SetAPType(const CFX_ByteString& sAPType); 29 void SetAPType(const CFX_ByteString& sAPType);
31 30
32 protected: 31 protected:
33 virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, 32 // CPWL_FontMap:
34 int32_t nCharset); 33 CPDF_Document* GetDocument() override;
35 virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias); 34 CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias,
36 virtual CPDF_Document* GetDocument(); 35 int32_t nCharset) override;
36 void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias) override;
37 37
38 private: 38 private:
39 CPDF_Font* FindResFontSameCharset(CPDF_Dictionary* pResDict, 39 CPDF_Font* FindResFontSameCharset(CPDF_Dictionary* pResDict,
40 CFX_ByteString& sFontAlias, 40 CFX_ByteString& sFontAlias,
41 int32_t nCharset); 41 int32_t nCharset);
42 CPDF_Font* GetAnnotDefaultFont(CFX_ByteString& csNameTag); 42 CPDF_Font* GetAnnotDefaultFont(CFX_ByteString& csNameTag);
43 void AddFontToAnnotDict(CPDF_Font* pFont, const CFX_ByteString& sAlias); 43 void AddFontToAnnotDict(CPDF_Font* pFont, const CFX_ByteString& sAlias);
44 44
45 private: 45 private:
Tom Sepez 2015/12/25 01:11:56 nit: duplicate "private"
Lei Zhang 2015/12/25 04:42:47 Done.
46 CPDF_Document* m_pDocument; 46 CPDF_Document* m_pDocument;
47 CPDF_Dictionary* m_pAnnotDict; 47 CPDF_Dictionary* m_pAnnotDict;
48 CPDF_Font* m_pDefaultFont; 48 CPDF_Font* m_pDefaultFont;
49 CFX_ByteString m_sDefaultFontName; 49 CFX_ByteString m_sDefaultFontName;
50 50
Tom Sepez 2015/12/25 01:11:56 nit: no blank line here.
Lei Zhang 2015/12/25 04:42:47 Done.
51 CFX_ByteString m_sAPType; 51 CFX_ByteString m_sAPType;
52 }; 52 };
53 53
54 #endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_ 54 #endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_
OLDNEW
« no previous file with comments | « no previous file | fpdfsdk/include/pdfwindow/PWL_FontMap.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698