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

Unified Diff: src/ports/SkFontConfigInterface_direct_google3_factory.cpp

Issue 1936213002: Clean up SkFontConfigInterface implementation. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: SkOnce Created 4 years, 8 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/ports/SkFontConfigInterface_direct_factory.cpp ('k') | src/ports/SkFontConfigTypeface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontConfigInterface_direct_google3_factory.cpp
diff --git a/src/ports/SkFontConfigInterface_direct_google3_factory.cpp b/src/ports/SkFontConfigInterface_direct_google3_factory.cpp
index f0ac53fd8b5e62e176876690af99f8ca23b72d33..9e863d4f0b9bc3c8346ebbb339b42383f8d2b858 100644
--- a/src/ports/SkFontConfigInterface_direct_google3_factory.cpp
+++ b/src/ports/SkFontConfigInterface_direct_google3_factory.cpp
@@ -5,16 +5,12 @@
* found in the LICENSE file.
*/
-/* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
-
#include "SkFontConfigInterface_direct_google3.h"
-#include "SkMutex.h"
+#include "SkOnce.h"
-SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface(SkBaseMutex* mutex) {
- SkAutoMutexAcquire ac(mutex);
- static SkFontConfigInterfaceDirectGoogle3* singleton = nullptr;
- if (singleton == nullptr) {
- singleton = new SkFontConfigInterfaceDirectGoogle3;
- }
+SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface() {
+ static SkFontConfigInterface* singleton;
+ static SkOnce once;
+ once([]{ singleton = new SkFontConfigInterfaceDirectGoogle3(); });
return singleton;
}
« no previous file with comments | « src/ports/SkFontConfigInterface_direct_factory.cpp ('k') | src/ports/SkFontConfigTypeface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698