Better refcounting and locking

All major externally accessible objects (especially FontFamily and
FontCollection) are now reference counted. In addition, there is a
global lock intended to make operations thread-safe.

WIP notice: in this version of the patch, not all external API entry
points are protected by the lock. That should be fixed.

Change-Id: I14106196e99eb101e8bf1bcb4b81359759d2086c

1 files changed, 7 insertions, 0 deletions

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));
 }