From 1e1a7a5017ae54af144e7c7bd6ff7a2cd87146cd Mon Sep 17 00:00:00 2001
From: Mike Reed <reed@google.com>
Date: Tue, 19 Jan 2010 16:38:53 -0500
Subject: [PATCH] Do not merge

roll 1-line fix from master here. Fixes crasher when apps use custom fonts

fixes http://code.google.com/p/android/issues/detail?id=6030
---
 core/jni/android/graphics/Typeface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/jni/android/graphics/Typeface.cpp b/core/jni/android/graphics/Typeface.cpp
index 238ece1c849cd..7c7bfebd5f192 100644
--- a/core/jni/android/graphics/Typeface.cpp
+++ b/core/jni/android/graphics/Typeface.cpp
@@ -46,7 +46,7 @@ static SkTypeface* Typeface_createFromTypeface(JNIEnv* env, jobject, SkTypeface*
 }
  
 static void Typeface_unref(JNIEnv* env, jobject obj, SkTypeface* face) {
-    face->unref();
+    SkSafeUnref(face);
 }
 
 static int Typeface_getStyle(JNIEnv* env, jobject obj, SkTypeface* face) {