diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-03-28 16:10:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-28 16:10:06 -0700 |
| commit | b2a331eae94add78654bfed094066344f73ae757 (patch) | |
| tree | ad9a8b02f21a6f4821d85ee87c0828bce097d026 /core/jni/android/graphics/TextLayoutCache.cpp | |
| parent | 972ed5809c518ecaaca58723e85282e58c12758c (diff) | |
| parent | 43e4985abfcb69db8fb39a95794eb34a2f142214 (diff) | |
| download | frameworks_base-b2a331eae94add78654bfed094066344f73ae757.zip frameworks_base-b2a331eae94add78654bfed094066344f73ae757.tar.gz frameworks_base-b2a331eae94add78654bfed094066344f73ae757.tar.bz2 | |
Merge "Fix bug #6248364 Tamil and Denavagari text crash in Google+"
Diffstat (limited to 'core/jni/android/graphics/TextLayoutCache.cpp')
| -rw-r--r-- | core/jni/android/graphics/TextLayoutCache.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index efeba5c..a7abbfa 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -341,6 +341,8 @@ TextLayoutShaper::TextLayoutShaper() : mShaperItemGlyphArraySize(0) { mHebrewBoldTypeface = NULL; mBengaliTypeface = NULL; mThaiTypeface = NULL; + mDevanagariTypeface = NULL; + mTamilTypeface = NULL; mFontRec.klass = &harfbuzzSkiaClass; mFontRec.userData = 0; @@ -383,6 +385,8 @@ TextLayoutShaper::~TextLayoutShaper() { SkSafeUnref(mHebrewBoldTypeface); SkSafeUnref(mBengaliTypeface); SkSafeUnref(mThaiTypeface); + SkSafeUnref(mDevanagariTypeface); + SkSafeUnref(mTamilTypeface); deleteShaperItemGlyphArrays(); } |