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

Side by Side Diff: core/src/fxge/apple/fx_mac_imp.cpp

Issue 1368513002: Merge to XFA: Allow external font-path configuration from pdfium_test. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years, 3 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 | « core/include/fxge/fx_ge.h ('k') | core/src/fxge/ge/fx_ge.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/fxge/fx_ge.h" 7 #include "../../../include/fxge/fx_ge.h"
8 #include "apple_int.h" 8 #include "apple_int.h"
9 #if _FX_OS_ == _FX_MACOSX_ 9 #if _FX_OS_ == _FX_MACOSX_
10 static const struct { 10 static const struct {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 break; 87 break;
88 case FXFONT_CHINESEBIG5_CHARSET: 88 case FXFONT_CHINESEBIG5_CHARSET:
89 face = "LiSong Pro Light"; 89 face = "LiSong Pro Light";
90 } 90 }
91 it = m_FontList.find(face); 91 it = m_FontList.find(face);
92 if (it != m_FontList.end()) 92 if (it != m_FontList.end())
93 return it->second; 93 return it->second;
94 94
95 return NULL; 95 return NULL;
96 } 96 }
97 IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault() { 97 IFX_SystemFontInfo* IFX_SystemFontInfo::CreateDefault(const char** pUnused) {
98 CFX_MacFontInfo* pInfo = new CFX_MacFontInfo; 98 CFX_MacFontInfo* pInfo = new CFX_MacFontInfo;
99 if (!pInfo) { 99 if (!pInfo) {
100 return NULL; 100 return NULL;
101 } 101 }
102 pInfo->AddPath("~/Library/Fonts"); 102 pInfo->AddPath("~/Library/Fonts");
103 pInfo->AddPath("/Library/Fonts"); 103 pInfo->AddPath("/Library/Fonts");
104 pInfo->AddPath("/System/Library/Fonts"); 104 pInfo->AddPath("/System/Library/Fonts");
105 return pInfo; 105 return pInfo;
106 } 106 }
107 void CFX_GEModule::InitPlatform() { 107 void CFX_GEModule::InitPlatform() {
108 m_pPlatformData = new CApplePlatform; 108 m_pPlatformData = new CApplePlatform;
109 m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault()); 109 m_pFontMgr->SetSystemFontInfo(IFX_SystemFontInfo::CreateDefault(nullptr));
110 } 110 }
111 void CFX_GEModule::DestroyPlatform() { 111 void CFX_GEModule::DestroyPlatform() {
112 delete (CApplePlatform*)m_pPlatformData; 112 delete (CApplePlatform*)m_pPlatformData;
113 m_pPlatformData = NULL; 113 m_pPlatformData = NULL;
114 } 114 }
115 #endif 115 #endif
OLDNEW
« no previous file with comments | « core/include/fxge/fx_ge.h ('k') | core/src/fxge/ge/fx_ge.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698