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

Side by Side Diff: core/fxge/ge/fx_ge_linux.cpp

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge Created 4 years, 6 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/fxge/ge/fx_ge_fontmap.cpp ('k') | core/fxge/ge/fx_ge_path.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 #ifndef _SKIA_SUPPORT_ 7 #ifndef _SKIA_SUPPORT_
8 #include "core/fxge/agg/fx_agg_driver.h" 8 #include "core/fxge/agg/fx_agg_driver.h"
9 #endif 9 #endif
10 10
(...skipping 10 matching lines...) Expand all
21 const FX_CHAR* family, 21 const FX_CHAR* family,
22 int& iExact) override; 22 int& iExact) override;
23 FX_BOOL ParseFontCfg(const char** pUserPaths); 23 FX_BOOL ParseFontCfg(const char** pUserPaths);
24 }; 24 };
25 #define LINUX_GPNAMESIZE 6 25 #define LINUX_GPNAMESIZE 6
26 static const struct { 26 static const struct {
27 const FX_CHAR* NameArr[LINUX_GPNAMESIZE]; 27 const FX_CHAR* NameArr[LINUX_GPNAMESIZE];
28 } LinuxGpFontList[] = { 28 } LinuxGpFontList[] = {
29 {{"TakaoPGothic", "VL PGothic", "IPAPGothic", "VL Gothic", "Kochi Gothic", 29 {{"TakaoPGothic", "VL PGothic", "IPAPGothic", "VL Gothic", "Kochi Gothic",
30 "VL Gothic regular"}}, 30 "VL Gothic regular"}},
31 {{"TakaoGothic", "VL Gothic", "IPAGothic", "Kochi Gothic", NULL, 31 {{"TakaoGothic", "VL Gothic", "IPAGothic", "Kochi Gothic", nullptr,
32 "VL Gothic regular"}}, 32 "VL Gothic regular"}},
33 {{"TakaoPMincho", "IPAPMincho", "VL Gothic", "Kochi Mincho", NULL, 33 {{"TakaoPMincho", "IPAPMincho", "VL Gothic", "Kochi Mincho", nullptr,
34 "VL Gothic regular"}}, 34 "VL Gothic regular"}},
35 {{"TakaoMincho", "IPAMincho", "VL Gothic", "Kochi Mincho", NULL, 35 {{"TakaoMincho", "IPAMincho", "VL Gothic", "Kochi Mincho", nullptr,
36 "VL Gothic regular"}}, 36 "VL Gothic regular"}},
37 }; 37 };
38 static const FX_CHAR* const g_LinuxGbFontList[] = { 38 static const FX_CHAR* const g_LinuxGbFontList[] = {
39 "AR PL UMing CN Light", "WenQuanYi Micro Hei", "AR PL UKai CN", 39 "AR PL UMing CN Light", "WenQuanYi Micro Hei", "AR PL UKai CN",
40 }; 40 };
41 static const FX_CHAR* const g_LinuxB5FontList[] = { 41 static const FX_CHAR* const g_LinuxB5FontList[] = {
42 "AR PL UMing TW Light", "WenQuanYi Micro Hei", "AR PL UKai TW", 42 "AR PL UMing TW Light", "WenQuanYi Micro Hei", "AR PL UKai TW",
43 }; 43 };
44 static const FX_CHAR* const g_LinuxHGFontList[] = { 44 static const FX_CHAR* const g_LinuxHGFontList[] = {
45 "UnDotum", 45 "UnDotum",
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 AddPath(*pPath); 144 AddPath(*pPath);
145 return TRUE; 145 return TRUE;
146 } 146 }
147 147
148 void CFX_GEModule::InitPlatform() { 148 void CFX_GEModule::InitPlatform() {
149 m_pFontMgr->SetSystemFontInfo( 149 m_pFontMgr->SetSystemFontInfo(
150 IFX_SystemFontInfo::CreateDefault(m_pUserFontPaths)); 150 IFX_SystemFontInfo::CreateDefault(m_pUserFontPaths));
151 } 151 }
152 void CFX_GEModule::DestroyPlatform() {} 152 void CFX_GEModule::DestroyPlatform() {}
153 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ 153 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_
OLDNEW
« no previous file with comments | « core/fxge/ge/fx_ge_fontmap.cpp ('k') | core/fxge/ge/fx_ge_path.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698