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

Unified Diff: src/ports/SkFontHost_fontconfig.cpp

Issue 2199973002: Rename FontConfigInterface font manager files. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: All the build systems. Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/fonts/SkFontMgr_fontconfig.cpp ('k') | src/ports/SkFontMgr_FontConfigInterface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
« no previous file with comments | « src/fonts/SkFontMgr_fontconfig.cpp ('k') | src/ports/SkFontMgr_FontConfigInterface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698