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

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

Issue 1089823004: Replace FX_NEW with new, remove tests from fpdfsdk (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebased Created 5 years, 8 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/src/fpdf_progressive.cpp ('k') | fpdfsdk/src/fpdf_transformpage.cpp » ('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 #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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 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)
84 { 84 {
85 ((CFX_FontMapper*)mapper)->AddInstalledFont(name, charset); 85 ((CFX_FontMapper*)mapper)->AddInstalledFont(name, charset);
86 } 86 }
87 87
88 DLLEXPORT void STDCALL FPDF_SetSystemFontInfo(FPDF_SYSFONTINFO* pFontInfoExt) 88 DLLEXPORT void STDCALL FPDF_SetSystemFontInfo(FPDF_SYSFONTINFO* pFontInfoExt)
89 { 89 {
90 if (pFontInfoExt->version != 1) return; 90 if (pFontInfoExt->version != 1) return;
91 91
92 » CSysFontInfo_Ext* pFontInfo = FX_NEW CSysFontInfo_Ext; 92 » CSysFontInfo_Ext* pFontInfo = new CSysFontInfo_Ext;
93 pFontInfo->m_pInfo = pFontInfoExt; 93 pFontInfo->m_pInfo = pFontInfoExt;
94 CFX_GEModule::Get()->GetFontMgr()->SetSystemFontInfo(pFontInfo); 94 CFX_GEModule::Get()->GetFontMgr()->SetSystemFontInfo(pFontInfo);
95 } 95 }
96 96
97 struct FPDF_SYSFONTINFO_DEFAULT : public FPDF_SYSFONTINFO 97 struct FPDF_SYSFONTINFO_DEFAULT : public FPDF_SYSFONTINFO
98 { 98 {
99 IFX_SystemFontInfo* m_pFontInfo; 99 IFX_SystemFontInfo* m_pFontInfo;
100 }; 100 };
101 101
102 static void DefaultRelease(struct _FPDF_SYSFONTINFO* pThis) 102 static void DefaultRelease(struct _FPDF_SYSFONTINFO* pThis)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 pFontInfoExt->GetFaceName = DefaultGetFaceName; 157 pFontInfoExt->GetFaceName = DefaultGetFaceName;
158 pFontInfoExt->GetFont = DefaultGetFont; 158 pFontInfoExt->GetFont = DefaultGetFont;
159 pFontInfoExt->GetFontCharset = DefaultGetFontCharset; 159 pFontInfoExt->GetFontCharset = DefaultGetFontCharset;
160 pFontInfoExt->GetFontData = DefaultGetFontData; 160 pFontInfoExt->GetFontData = DefaultGetFontData;
161 pFontInfoExt->MapFont = DefaultMapFont; 161 pFontInfoExt->MapFont = DefaultMapFont;
162 pFontInfoExt->Release = DefaultRelease; 162 pFontInfoExt->Release = DefaultRelease;
163 pFontInfoExt->version = 1; 163 pFontInfoExt->version = 1;
164 pFontInfoExt->m_pFontInfo = pFontInfo; 164 pFontInfoExt->m_pFontInfo = pFontInfo;
165 return pFontInfoExt; 165 return pFontInfoExt;
166 } 166 }
OLDNEW
« no previous file with comments | « fpdfsdk/src/fpdf_progressive.cpp ('k') | fpdfsdk/src/fpdf_transformpage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698