| Index: src/ports/SkFontHost_fontconfig.cpp
|
| diff --git a/src/ports/SkFontHost_fontconfig.cpp b/src/ports/SkFontHost_fontconfig.cpp
|
| index 0ffc26116f9880a86bf8c6ba43400eef2c76cf49..90da2fd5ca2e2a997972bebff109230aecf44669 100644
|
| --- a/src/ports/SkFontHost_fontconfig.cpp
|
| +++ b/src/ports/SkFontHost_fontconfig.cpp
|
| @@ -5,40 +5,4 @@
|
| * found in the LICENSE file.
|
| */
|
|
|
| -#include "SkFontConfigInterface.h"
|
| -#include "SkFontMgr.h"
|
| -#include "SkMutex.h"
|
| -#include "SkRefCnt.h"
|
| -
|
| -SK_DECLARE_STATIC_MUTEX(gFontConfigInterfaceMutex);
|
| -static SkFontConfigInterface* gFontConfigInterface;
|
| -
|
| -SkFontConfigInterface* SkFontConfigInterface::RefGlobal() {
|
| - SkAutoMutexAcquire ac(gFontConfigInterfaceMutex);
|
| -
|
| - return SkSafeRef(gFontConfigInterface);
|
| -}
|
| -
|
| -SkFontConfigInterface* SkFontConfigInterface::SetGlobal(SkFontConfigInterface* fc) {
|
| - SkAutoMutexAcquire ac(gFontConfigInterfaceMutex);
|
| -
|
| - SkRefCnt_SafeAssign(gFontConfigInterface, fc);
|
| - return fc;
|
| -}
|
| -
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -
|
| -static SkFontConfigInterface* init_FCI() {
|
| - SkAutoMutexAcquire ac(gFontConfigInterfaceMutex);
|
| -
|
| - if (gFontConfigInterface) {
|
| - return SkRef(gFontConfigInterface);
|
| - }
|
| - gFontConfigInterface = SkRef(SkFontConfigInterface::GetSingletonDirectInterface());
|
| - return gFontConfigInterface;
|
| -}
|
| -
|
| -SkFontMgr* SkFontMgr::Factory() {
|
| - SkFontConfigInterface* fci = init_FCI();
|
| - return fci ? SkFontMgr_New_FCI(fci) : nullptr;
|
| -}
|
| +#include "SkFontMgr_FontConfigInterface_factory.cpp"
|
|
|