7 files changed, 108 insertions, 8 deletions
diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk
index 5e13495..c441285 100644
--- a/libs/minikin/Android.mk
+++ b/libs/minikin/Android.mk
@@ -24,6 +24,8 @@ LOCAL_SRC_FILES := \
     FontCollection.cpp \
     FontFamily.cpp \
     Layout.cpp \
+    MinikinInternal.cpp \
+    MinikinRefCounted.cpp \
     MinikinFontFreeType.cpp \
     SparseBitSet.cpp
 
diff --git a/libs/minikin/FontCollection.cpp b/libs/minikin/FontCollection.cpp
index aa37825..18e528e 100644
--- a/libs/minikin/FontCollection.cpp
+++ b/libs/minikin/FontCollection.cpp
@@ -41,6 +41,7 @@ FontCollection::FontCollection(const vector<FontFamily*>& typefaces) :
     const FontStyle defaultStyle;
     for (size_t i = 0; i < nTypefaces; i++) {
         FontFamily* family = typefaces[i];
+        family->RefLocked();
         FontInstance dummy;
         mInstances.push_back(dummy);  // emplace_back would be better
         FontInstance* instance = &mInstances.back();
@@ -62,7 +63,6 @@ FontCollection::FontCollection(const vector<FontFamily*>& typefaces) :
 #endif
         mMaxChar = max(mMaxChar, instance->mCoverage->length());
         lastChar.push_back(instance->mCoverage->nextSetBit(0));
-        // TODO: should probably ref typeface here, hmm
     }
     size_t nPages = mMaxChar >> kLogCharsPerPage;
     size_t offset = 0;
@@ -93,7 +93,7 @@ FontCollection::FontCollection(const vector<FontFamily*>& typefaces) :
 FontCollection::~FontCollection() {
     for (size_t i = 0; i < mInstances.size(); i++) {
         delete mInstances[i].mCoverage;
-        // probably unref the typeface here too
+        mInstances[i].mFamily->UnrefLocked();
     }
 }
 
@@ -138,7 +138,7 @@ void FontCollection::itemize(const uint16_t *string, size_t string_size, FontSty
                 run->font = NULL;  // maybe we should do something different here
             } else {
                 run->font = family->getClosestMatch(style);
-                run->font->Ref();
+                run->font->RefLocked();
             }
             lastFamily = family;
             run->start = i;
diff --git a/libs/minikin/FontFamily.cpp b/libs/minikin/FontFamily.cpp
index 16031ce..d8525ff 100644
--- a/libs/minikin/FontFamily.cpp
+++ b/libs/minikin/FontFamily.cpp
@@ -28,6 +28,12 @@ using std::vector;
 
 namespace android {
 
+FontFamily::~FontFamily() {
+    for (size_t i = 0; i < mFonts.size(); i++) {
+        mFonts[i].typeface->UnrefLocked();
+    }
+}
+
 bool FontFamily::addFont(MinikinFont* typeface) {
     const uint32_t os2Tag = MinikinFont::MakeTag('O', 'S', '/', '2');
     size_t os2Size = 0;
@@ -50,6 +56,7 @@ bool FontFamily::addFont(MinikinFont* typeface) {
 }
 
 void FontFamily::addFont(MinikinFont* typeface, FontStyle style) {
+    typeface->RefLocked();
     mFonts.push_back(Font(typeface, style));
 }
 
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp
index ffaa451..20e2d9e 100644
--- a/libs/minikin/Layout.cpp
+++ b/libs/minikin/Layout.cpp
@@ -25,8 +25,7 @@
 
 #include <hb-icu.h>
 
-#include <utils/Mutex.h>
-
+#include "MinikinInternal.h"
 #include <minikin/MinikinFontFreeType.h>
 #include <minikin/Layout.h>
 
@@ -38,8 +37,6 @@ namespace android {
 // TODO: globals are not cool, move to a factory-ish object
 hb_buffer_t* buffer = 0;
 
-Mutex gLock;
-
 Bitmap::Bitmap(int width, int height) : width(width), height(height) {
     buf = new uint8_t[width * height]();
 }
@@ -280,7 +277,7 @@ static hb_script_t getScriptRun(const uint16_t *chars, size_t len, ssize_t *iter
 
 // TODO: API should probably take context
 void Layout::doLayout(const uint16_t* buf, size_t nchars) {
-    AutoMutex _l(gLock);
+    AutoMutex _l(gMinikinLock);
     if (buffer == 0) {
         buffer = hb_buffer_create();
     }
diff --git a/libs/minikin/MinikinInternal.cpp b/libs/minikin/MinikinInternal.cpp
new file mode 100644
index 0000000..71c8649
--- /dev/null
+++ b/libs/minikin/MinikinInternal.cpp
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Definitions internal to Minikin
+
+#include "MinikinInternal.h"
+
+namespace android {
+
+Mutex gMinikinLock;
+
+}
diff --git a/libs/minikin/MinikinInternal.h b/libs/minikin/MinikinInternal.h
new file mode 100644
index 0000000..b8430df
--- /dev/null
+++ b/libs/minikin/MinikinInternal.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Definitions internal to Minikin
+
+#ifndef MINIKIN_INTERNAL_H
+#define MINIKIN_INTERNAL_H
+
+#include <utils/Mutex.h>
+
+namespace android {
+
+// All external Minikin interfaces are designed to be thread-safe.
+// Presently, that's implemented by through a global lock, and having
+// all external interfaces take that lock.
+
+extern Mutex gMinikinLock;
+
+}
+
+#endif  // MINIKIN_INTERNAL_H
diff --git a/libs/minikin/MinikinRefCounted.cpp b/libs/minikin/MinikinRefCounted.cpp
new file mode 100644
index 0000000..9fa3ae4
--- /dev/null
+++ b/libs/minikin/MinikinRefCounted.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Base class for reference counted objects in Minikin
+
+#include "MinikinInternal.h"
+
+#include <minikin/MinikinRefCounted.h>
+
+namespace android {
+
+void MinikinRefCounted::Ref() {
+    AutoMutex _l(gMinikinLock);
+    this->RefLocked();
+}
+
+void MinikinRefCounted::Unref() {
+    AutoMutex _l(gMinikinLock);
+    this->UnrefLocked();
+}
+
+}