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

Side by Side Diff: fpdfsdk/src/fpdf_sysfontinfo.cpp

Issue 842223004: merge to XFA: Fix -Wnon-virtual-dtor compiler warnings. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 11 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 | « fpdfsdk/include/pdfwindow/PWL_Wnd.h ('k') | no next file » | 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 #include "../include/fsdk_define.h" 7 #include "../include/fsdk_define.h"
8 #include "../include/fpdf_sysfontinfo.h" 8 #include "../include/fpdf_sysfontinfo.h"
9 9
10 class CSysFontInfo_Ext FX_FINAL : public IFX_SystemFontInfo 10 class CSysFontInfo_Ext FX_FINAL : public IFX_SystemFontInfo
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 return TRUE; 68 return TRUE;
69 } 69 }
70 return FALSE; 70 return FALSE;
71 } 71 }
72 72
73 virtual void DeleteFont(void* hFont) FX_OVERRIDE 73 virtual void DeleteFont(void* hFont) FX_OVERRIDE
74 { 74 {
75 if (m_pInfo->DeleteFont) 75 if (m_pInfo->DeleteFont)
76 m_pInfo->DeleteFont(m_pInfo, hFont); 76 m_pInfo->DeleteFont(m_pInfo, hFont);
77 } 77 }
78
79 private:
80 ~CSysFontInfo_Ext() { }
78 }; 81 };
79 82
80 DLLEXPORT void STDCALL FPDF_AddInstalledFont(void* mapper, const char* name, int charset) 83 DLLEXPORT void STDCALL FPDF_AddInstalledFont(void* mapper, const char* name, int charset)
81 { 84 {
82 ((CFX_FontMapper*)mapper)->AddInstalledFont(name, charset); 85 ((CFX_FontMapper*)mapper)->AddInstalledFont(name, charset);
83 } 86 }
84 87
85 DLLEXPORT void STDCALL FPDF_SetSystemFontInfo(FPDF_SYSFONTINFO* pFontInfoExt) 88 DLLEXPORT void STDCALL FPDF_SetSystemFontInfo(FPDF_SYSFONTINFO* pFontInfoExt)
86 { 89 {
87 if (pFontInfoExt->version != 1) return; 90 if (pFontInfoExt->version != 1) return;
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 pFontInfoExt->GetFaceName = DefaultGetFaceName; 157 pFontInfoExt->GetFaceName = DefaultGetFaceName;
155 pFontInfoExt->GetFont = DefaultGetFont; 158 pFontInfoExt->GetFont = DefaultGetFont;
156 pFontInfoExt->GetFontCharset = DefaultGetFontCharset; 159 pFontInfoExt->GetFontCharset = DefaultGetFontCharset;
157 pFontInfoExt->GetFontData = DefaultGetFontData; 160 pFontInfoExt->GetFontData = DefaultGetFontData;
158 pFontInfoExt->MapFont = DefaultMapFont; 161 pFontInfoExt->MapFont = DefaultMapFont;
159 pFontInfoExt->Release = DefaultRelease; 162 pFontInfoExt->Release = DefaultRelease;
160 pFontInfoExt->version = 1; 163 pFontInfoExt->version = 1;
161 pFontInfoExt->m_pFontInfo = pFontInfo; 164 pFontInfoExt->m_pFontInfo = pFontInfo;
162 return pFontInfoExt; 165 return pFontInfoExt;
163 } 166 }
OLDNEW
« no previous file with comments | « fpdfsdk/include/pdfwindow/PWL_Wnd.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698