| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2008 Google Inc. | 2 * Copyright 2008 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 "SkFontConfigInterface.h" | 8 #include "SkFontConfigInterface.h" |
| 9 #include "SkFontMgr.h" | 9 #include "SkFontMgr.h" |
| 10 #include "SkFontMgr_FontConfigInterface.h" | 10 #include "SkFontMgr_FontConfigInterface.h" |
| 11 | 11 |
| 12 #ifdef SK_ADDING_src_ports_SkFontConfigInterface_cpp | |
| 13 // The code previously here is moving to SkFontConfigInterface.cpp | |
| 14 #include "SkFontConfigInterface.cpp" | |
| 15 #endif | |
| 16 | |
| 17 SkFontMgr* SkFontMgr::Factory() { | 12 SkFontMgr* SkFontMgr::Factory() { |
| 18 sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal()); | 13 sk_sp<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal()); |
| 19 if (!fci) { | 14 if (!fci) { |
| 20 return nullptr; | 15 return nullptr; |
| 21 } | 16 } |
| 22 return SkFontMgr_New_FCI(std::move(fci)); | 17 return SkFontMgr_New_FCI(std::move(fci)); |
| 23 } | 18 } |
| OLD | NEW |