Bug 1108616 - part 1 - Language-specific text-transform casing behavior should only be used when content was explicitly tagged for language. r=dbaron

2014-12-23 12:50:10 +00:00
parent 128b98327c
commit 1973511697
1 changed files with 5 additions and 2 deletions
@@ -311,8 +311,11 @@ nsCaseTransformTextRunFactory::TransformString(
      style = aAllUppercase ? NS_STYLE_TEXT_TRANSFORM_UPPERCASE :
        styleContext->StyleText()->mTextTransform;

-      if (lang != styleContext->StyleFont()->mLanguage) {
-        lang = styleContext->StyleFont()->mLanguage;
+      const nsStyleFont* styleFont = styleContext->StyleFont();
+      nsIAtom* newLang = styleFont->mExplicitLanguage
+                         ? styleFont->mLanguage : nullptr;
+      if (lang != newLang) {
+        lang = newLang;
        languageSpecificCasing = GetCasingFor(lang);
        greekState.Reset();
        irishState.Reset();