From 6fadccd2484233ed570218b3f97c085ef1a1ec28 Mon Sep 17 00:00:00 2001 From: Billy Hewlett Date: Thu, 21 Jun 2012 09:45:30 -0700 Subject: [PATCH] Revert "Use Elegant fonts for Webkit, Compact fonts for Textview" This reverts commit ecf80965d05e44b3701b3392aeb02028daacf1b0 --- core/jni/android/graphics/TextLayoutCache.cpp | 35 +++++++++------------------ core/jni/android/graphics/TextLayoutCache.h | 2 +- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp index 5da4a0998be5..023e6d127c4d 100644 --- a/core/jni/android/graphics/TextLayoutCache.cpp +++ b/core/jni/android/graphics/TextLayoutCache.cpp @@ -755,8 +755,7 @@ SkTypeface* TextLayoutShaper::typefaceForUnichar(const SkPaint* paint, SkTypefac // Set the correct Typeface depending on the script switch (script) { case HB_Script_Arabic: - typeface = getCachedTypeface(&mArabicTypeface, HB_Script_Arabic, - SkTypeface::kNormal); + typeface = getCachedTypeface(&mArabicTypeface, kArabic_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Arabic Typeface"); #endif @@ -767,8 +766,7 @@ SkTypeface* TextLayoutShaper::typefaceForUnichar(const SkPaint* paint, SkTypefac switch (typeface->style()) { case SkTypeface::kBold: case SkTypeface::kBoldItalic: - typeface = getCachedTypeface(&mHebrewBoldTypeface, HB_Script_Hebrew, - SkTypeface::kBold); + typeface = getCachedTypeface(&mHebrewBoldTypeface, kHebrewBold_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Hebrew Bold/BoldItalic Typeface"); #endif @@ -777,16 +775,14 @@ SkTypeface* TextLayoutShaper::typefaceForUnichar(const SkPaint* paint, SkTypefac case SkTypeface::kNormal: case SkTypeface::kItalic: default: - typeface = getCachedTypeface(&mHebrewRegularTypeface, HB_Script_Hebrew, - SkTypeface::kNormal); + typeface = getCachedTypeface(&mHebrewRegularTypeface, kHebrewRegular_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Hebrew Regular/Italic Typeface"); #endif break; } } else { - typeface = getCachedTypeface(&mHebrewRegularTypeface, HB_Script_Hebrew, - SkTypeface::kNormal); + typeface = getCachedTypeface(&mHebrewRegularTypeface, kHebrewRegular_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Hebrew Regular Typeface"); #endif @@ -794,24 +790,21 @@ SkTypeface* TextLayoutShaper::typefaceForUnichar(const SkPaint* paint, SkTypefac break; case HB_Script_Bengali: - typeface = getCachedTypeface(&mBengaliTypeface, HB_Script_Bengali, - SkTypeface::kNormal); + typeface = getCachedTypeface(&mBengaliTypeface, kBengali_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Bengali Typeface"); #endif break; case HB_Script_Thai: - typeface = getCachedTypeface(&mThaiTypeface, HB_Script_Thai, - SkTypeface::kNormal); + typeface = getCachedTypeface(&mThaiTypeface, kThai_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Thai Typeface"); #endif break; case HB_Script_Devanagari: - typeface = getCachedTypeface(&mDevanagariRegularTypeface, HB_Script_Devanagari, - SkTypeface::kNormal); + typeface = getCachedTypeface(&mDevanagariRegularTypeface, kDevanagari_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Devanagari Regular Typeface"); #endif @@ -822,8 +815,7 @@ SkTypeface* TextLayoutShaper::typefaceForUnichar(const SkPaint* paint, SkTypefac switch (typeface->style()) { case SkTypeface::kBold: case SkTypeface::kBoldItalic: - typeface = getCachedTypeface(&mTamilBoldTypeface, HB_Script_Tamil, - SkTypeface::kBold); + typeface = getCachedTypeface(&mTamilBoldTypeface, kTamilBold_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Tamil Bold Typeface"); #endif @@ -832,16 +824,14 @@ SkTypeface* TextLayoutShaper::typefaceForUnichar(const SkPaint* paint, SkTypefac case SkTypeface::kNormal: case SkTypeface::kItalic: default: - typeface = getCachedTypeface(&mTamilRegularTypeface, HB_Script_Tamil, - SkTypeface::kNormal); + typeface = getCachedTypeface(&mTamilRegularTypeface, kTamilRegular_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Tamil Regular Typeface"); #endif break; } } else { - typeface = getCachedTypeface(&mTamilRegularTypeface, HB_Script_Tamil, - SkTypeface::kNormal); + typeface = getCachedTypeface(&mTamilRegularTypeface, kTamilRegular_FallbackScript); #if DEBUG_GLYPHS ALOGD("Using Tamil Regular Typeface"); #endif @@ -959,10 +949,9 @@ void TextLayoutShaper::deleteShaperItemGlyphArrays() { delete[] mShaperItem.log_clusters; } -SkTypeface* TextLayoutShaper::getCachedTypeface(SkTypeface** typeface, HB_Script script, - SkTypeface::Style style) { +SkTypeface* TextLayoutShaper::getCachedTypeface(SkTypeface** typeface, FallbackScripts fallbackEnum) { if (!*typeface) { - *typeface = SkCreateTypefaceForScript(script, style); + *typeface = SkCreateTypefaceForScript(fallbackEnum); // CreateFromFile(path) can return NULL if the path is non existing if (!*typeface) { #if DEBUG_GLYPHS diff --git a/core/jni/android/graphics/TextLayoutCache.h b/core/jni/android/graphics/TextLayoutCache.h index 3cac0746fe0a..4f7ecdf97aeb 100644 --- a/core/jni/android/graphics/TextLayoutCache.h +++ b/core/jni/android/graphics/TextLayoutCache.h @@ -239,7 +239,7 @@ private: Vector* const outAdvances, jfloat* outTotalAdvance, Vector* const outGlyphs); - SkTypeface* getCachedTypeface(SkTypeface** typeface, HB_Script script, SkTypeface::Style style); + SkTypeface* getCachedTypeface(SkTypeface** typeface, FallbackScripts fallbackEnum); HB_Face getCachedHBFace(SkTypeface* typeface); void ensureShaperItemGlyphArrays(size_t size); -- 2.11.0