1 files changed, 3 insertions, 10 deletions
diff --git a/chromium/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp b/chromium/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
index 13993f10c0d..dc9afbae1f4 100644
--- a/chromium/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
+++ b/chromium/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
@@ -15,6 +15,7 @@
 
 #include "SkBuffer.h"
 #include "SkFontConfigInterface.h"
+#include "SkLazyPtr.h"
 #include "SkStream.h"
 
 size_t SkFontConfigInterface::FontIdentity::writeToMemory(void* addr) const {
@@ -124,16 +125,8 @@ private:
 };
 
 SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface() {
-    static SkFontConfigInterface* gDirect;
-    if (NULL == gDirect) {
-        static SkMutex gMutex;
-        SkAutoMutexAcquire ac(gMutex);
-
-        if (NULL == gDirect) {
-            gDirect = new SkFontConfigInterfaceDirect;
-        }
-    }
-    return gDirect;
+    SK_DECLARE_STATIC_LAZY_PTR(SkFontConfigInterfaceDirect, direct);
+    return direct.get();
 }
 
 ///////////////////////////////////////////////////////////////////////////////