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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/ports/SkFontConfigInterface_android.cpp

Issue 419113002: Fix thread unsafe mutex initialization. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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
« include/core/SkInstCnt.h ('K') | « src/pdf/SkPDFShader.cpp ('k') | src/ports/SkFontHost_mac.cpp » ('j') | src/ports/SkMutex_pthread.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontConfigInterface_android.cpp
diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp
index 1323a62d7a5f37489100eb8ade2a5d6f34c9dd58..94662f5d5949844ec9a77fee69dcfd924c73f1ff 100644
--- a/src/ports/SkFontConfigInterface_android.cpp
+++ b/src/ports/SkFontConfigInterface_android.cpp
@@ -132,11 +132,11 @@ private:
///////////////////////////////////////////////////////////////////////////////
+SK_DECLARE_STATIC_MUTEX(gGetSingletonInterfaceMutex);
static SkFontConfigInterfaceAndroid* getSingletonInterface() {
- SK_DECLARE_STATIC_MUTEX(gMutex);
static SkFontConfigInterfaceAndroid* gFontConfigInterface;
- SkAutoMutexAcquire ac(gMutex);
+ SkAutoMutexAcquire ac(gGetSingletonInterfaceMutex);
if (NULL == gFontConfigInterface) {
// load info from a configuration file that we can use to populate the
// system/fallback font structures
« include/core/SkInstCnt.h ('K') | « src/pdf/SkPDFShader.cpp ('k') | src/ports/SkFontHost_mac.cpp » ('j') | src/ports/SkMutex_pthread.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698