commit 4cccc6b224cc37c99a3101893f645b7af776287e
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 30 12:42:12 2012 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 30 12:42:12 2012 +0000
tree 4b05fdec7f61cc985ab255838255f636faf7ab10
parent a0b63b86313694f695bf0387ee0ce31de3deabb3

Fix deadlock in Android's font deserializer.

git-svn-id: http://skia.googlecode.com/svn/trunk@3551 2bbb7eff-a529-9590-31e7-b0007b416f81

src/ports/SkFontHost_android.cpp

diff --git a/src/ports/SkFontHost_android.cpp b/src/ports/SkFontHost_android.cpp
index edbc016..230e990 100644
--- a/src/ports/SkFontHost_android.cpp
+++ b/src/ports/SkFontHost_android.cpp
@@ -745,9 +745,10 @@
 }
 
 SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
-    SkAutoMutexAcquire  ac(gFamilyHeadAndNameListMutex);
-
-    load_system_fonts();
+    {
+        SkAutoMutexAcquire  ac(gFamilyHeadAndNameListMutex);
+        load_system_fonts();
+    }
 
     // check if the font is a custom or system font
     bool isCustomFont = stream->readBool();