Title: [121609] trunk/Source/WebCore
- Revision
- 121609
- Author
- [email protected]
- Date
- 2012-06-29 18:23:37 -0700 (Fri, 29 Jun 2012)
Log Message
Update complex fonts on Android to use fonts from a newer SDK
https://bugs.webkit.org/show_bug.cgi?id=90296
Reviewed by Nate Chapin.
These fonts are available in the Jelly Bean SDK.
* platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp:
(WebCore::ComplexTextController::ComplexTextController):
(WebCore::ComplexTextController::getComplexFontPlatformData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121608 => 121609)
--- trunk/Source/WebCore/ChangeLog 2012-06-30 01:20:20 UTC (rev 121608)
+++ trunk/Source/WebCore/ChangeLog 2012-06-30 01:23:37 UTC (rev 121609)
@@ -1,3 +1,16 @@
+2012-06-29 Adam Barth <[email protected]>
+
+ Update complex fonts on Android to use fonts from a newer SDK
+ https://bugs.webkit.org/show_bug.cgi?id=90296
+
+ Reviewed by Nate Chapin.
+
+ These fonts are available in the Jelly Bean SDK.
+
+ * platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp:
+ (WebCore::ComplexTextController::ComplexTextController):
+ (WebCore::ComplexTextController::getComplexFontPlatformData):
+
2012-06-29 Ryosuke Niwa <[email protected]>
HTMLCollection's caches should be owned by either ElementRareData or Document
Modified: trunk/Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp (121608 => 121609)
--- trunk/Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp 2012-06-30 01:20:20 UTC (rev 121608)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/ComplexTextControllerHarfBuzz.cpp 2012-06-30 01:23:37 UTC (rev 121609)
@@ -80,6 +80,11 @@
m_item.string = m_normalizedBuffer.get();
m_item.stringLength = m_normalizedBufferLength;
+#if OS(ANDROID)
+ // Kerning does not currently work on Android.
+ m_item.shaperFlags = HB_ShaperFlag_NoKerning;
+#endif
+
reset(startingX);
m_startingY = startingY;
@@ -209,30 +214,42 @@
case HB_Script_Arabic:
fallbackScript = kArabic_FallbackScript;
break;
+ case HB_Script_Armenian:
+ fallbackScript = kArmenian_FallbackScript;
+ break;
+ case HB_Script_Bengali:
+ fallbackScript = kBengali_FallbackScript;
+ break;
+ case HB_Script_Devanagari:
+ fallbackScript = kDevanagari_FallbackScript;
+ break;
+ case HB_Script_Georgian:
+ fallbackScript = kGeorgian_FallbackScript;
+ break;
case HB_Script_Hebrew:
if (m_font->fontDescription().weight() >= FontWeightBold)
fallbackScript = kHebrewBold_FallbackScript;
else
fallbackScript = kHebrewRegular_FallbackScript;
break;
- case HB_Script_Thai:
- fallbackScript = kThai_FallbackScript;
+ case HB_Script_Kannada:
+ fallbackScript = kKannada_FallbackScript;
break;
- case HB_Script_Armenian:
- fallbackScript = kArmenian_FallbackScript;
+ case HB_Script_Malayalam:
+ fallbackScript = kMalayalam_FallbackScript;
break;
- case HB_Script_Georgian:
- fallbackScript = kGeorgian_FallbackScript;
+ case HB_Script_Tamil:
+ if (m_font->fontDescription().weight() >= FontWeightBold)
+ fallbackScript = kTamilBold_FallbackScript;
+ else
+ fallbackScript = kTamilRegular_FallbackScript;
break;
- case HB_Script_Devanagari:
- fallbackScript = kDevanagari_FallbackScript;
+ case HB_Script_Telugu:
+ fallbackScript = kTelugu_FallbackScript;
break;
- case HB_Script_Bengali:
- fallbackScript = kBengali_FallbackScript;
+ case HB_Script_Thai:
+ fallbackScript = kThai_FallbackScript;
break;
- case HB_Script_Tamil:
- fallbackScript = kTamil_FallbackScript;
- break;
default:
return 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
