From 4bd2bdbf04f21237337616aa931e34d7c8991edc Mon Sep 17 00:00:00 2001
From: "djsollen@google.com"
 <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Fri, 8 Mar 2013 18:35:13 +0000
Subject: Upstream changes from Android.

Review URL: https://codereview.chromium.org/12699002

git-svn-id: http://skia.googlecode.com/svn/trunk@8045 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 src/ports/SkFontHost_FreeType.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/ports')

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index b98cdcdfb4..9422cf99d3 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -694,6 +694,13 @@ void SkFontHost::FilterRec(SkScalerContext::Rec* rec, SkTypeface*) {
 #ifdef SK_BUILD_FOR_ANDROID
 uint32_t SkFontHost::GetUnitsPerEm(SkFontID fontID) {
     SkAutoMutexAcquire ac(gFTMutex);
+    FT_Library libInit = NULL;
+    if (gFTCount == 0) {
+        if (!InitFreetype())
+            sk_throw();
+        libInit = gFTLibrary;
+    }
+    SkAutoTCallIProc<struct FT_LibraryRec_, FT_Done_FreeType> ftLib(libInit);
     SkFaceRec *rec = ref_ft_face(fontID);
     uint16_t unitsPerEm = 0;
 
-- 
cgit v1.2.3