| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2014 Google Inc. | 2 * Copyright 2014 Google Inc. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license that can be | 4 * Use of this source code is governed by a BSD-style license that can be |
| 5 * found in the LICENSE file. | 5 * found in the LICENSE file. |
| 6 */ | 6 */ |
| 7 | 7 |
| 8 #include "SkFontConfigParser_android.h" | 8 #include "SkFontConfigParser_android.h" |
| 9 #include "SkFontDescriptor.h" | 9 #include "SkFontDescriptor.h" |
| 10 #include "SkFontHost_FreeType_common.h" | 10 #include "SkFontHost_FreeType_common.h" |
| (...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 | 499 |
| 500 SkFontMgr* SkFontMgr::Factory() { | 500 SkFontMgr* SkFontMgr::Factory() { |
| 501 // The call to SkGetTestFontConfiguration is so that Chromium can override t
he environment. | 501 // The call to SkGetTestFontConfiguration is so that Chromium can override t
he environment. |
| 502 // TODO: these globals need to be removed, in favor of a constructor / separ
ate Factory | 502 // TODO: these globals need to be removed, in favor of a constructor / separ
ate Factory |
| 503 // which can be used instead. | 503 // which can be used instead. |
| 504 const char* mainConfigFile; | 504 const char* mainConfigFile; |
| 505 const char* fallbackConfigFile; | 505 const char* fallbackConfigFile; |
| 506 const char* basePath; | 506 const char* basePath; |
| 507 SkGetTestFontConfiguration(&mainConfigFile, &fallbackConfigFile, &basePath); | 507 SkGetTestFontConfiguration(&mainConfigFile, &fallbackConfigFile, &basePath); |
| 508 if (mainConfigFile) { | 508 if (mainConfigFile) { |
| 509 SkNEW_ARGS(SkFontMgr_Android, (mainConfigFile, fallbackConfigFile, baseP
ath)); | 509 return SkNEW_ARGS(SkFontMgr_Android, (mainConfigFile, fallbackConfigFile
, basePath)); |
| 510 } | 510 } |
| 511 | 511 |
| 512 return SkNEW(SkFontMgr_Android); | 512 return SkNEW(SkFontMgr_Android); |
| 513 } | 513 } |
| OLD | NEW |