Bug 739804. Avoid using Cambria Math for symbol fallback. r=jkew
☠☠ backed out by c29e42966d59 ☠ ☠
authorJohn Daggett <jdaggett@mozilla.com>
Mon, 28 May 2012 12:30:50 +0900
changeset 99160 36f327aaffa5d7c0ed4bf1c84b488a18b6332754
parent 99159 5859f7d3fb2595b10e47353a96560c442691f488
child 99161 e2cd95fa1ce49bd5e04522d5eac23f4cd2d8601f
push idunknown
push userunknown
push dateunknown
reviewersjkew
bugs739804
milestone15.0a1
Bug 739804. Avoid using Cambria Math for symbol fallback. r=jkew
gfx/thebes/gfxWindowsPlatform.cpp
--- a/gfx/thebes/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/gfxWindowsPlatform.cpp
@@ -803,16 +803,17 @@ static const char kFontArialUnicodeMS[] 
 static const char kFontCambria[] = "Cambria";
 static const char kFontCambriaMath[] = "Cambria Math";
 static const char kFontEbrima[] = "Ebrima";
 static const char kFontEstrangeloEdessa[] = "Estrangelo Edessa";
 static const char kFontEuphemia[] = "Euphemia";
 static const char kFontGabriola[] = "Gabriola";
 static const char kFontKhmerUI[] = "Khmer UI";
 static const char kFontLaoUI[] = "Lao UI";
+static const char kFontLucidaSansUnicode[] = "Lucida Sans Unicode";
 static const char kFontMVBoli[] = "MV Boli";
 static const char kFontMalgunGothic[] = "Malgun Gothic";
 static const char kFontMicrosoftJhengHei[] = "Microsoft JhengHei";
 static const char kFontMicrosoftNewTaiLue[] = "Microsoft New Tai Lue";
 static const char kFontMicrosoftPhagsPa[] = "Microsoft PhagsPa";
 static const char kFontMicrosoftTaiLe[] = "Microsoft Tai Le";
 static const char kFontMicrosoftUighur[] = "Microsoft Uighur";
 static const char kFontMicrosoftYaHei[] = "Microsoft YaHei";
@@ -832,19 +833,19 @@ gfxWindowsPlatform::GetCommonFallbackFon
                                            nsTArray<const char*>& aFontList)
 {
     // Arial is used as the default fallback for system fallback
     aFontList.AppendElement(kFontArial);
 
     if (!IS_IN_BMP(aCh)) {
         PRUint32 p = aCh >> 16;
         if (p == 1) { // SMP plane
-            aFontList.AppendElement(kFontCambriaMath);
             aFontList.AppendElement(kFontSegoeUISymbol);
             aFontList.AppendElement(kFontEbrima);
+            aFontList.AppendElement(kFontCambriaMath);
         }
     } else {
         PRUint32 b = (aCh >> 8) & 0xff;
 
         switch (b) {
         case 0x05:
             aFontList.AppendElement(kFontEstrangeloEdessa);
             aFontList.AppendElement(kFontCambria);
@@ -893,19 +894,19 @@ gfxWindowsPlatform::GetCommonFallbackFon
         case 0x27:
         case 0x29:
         case 0x2a:
         case 0x2b:
         case 0x2c:
             aFontList.AppendElement(kFontSegoeUI);
             aFontList.AppendElement(kFontSegoeUISymbol);
             aFontList.AppendElement(kFontCambria);
-            aFontList.AppendElement(kFontCambriaMath);
             aFontList.AppendElement(kFontMeiryo);
             aFontList.AppendElement(kFontArial);
+            aFontList.AppendElement(kFontLucidaSansUnicode);
             aFontList.AppendElement(kFontEbrima);
             break;
         case 0x2d:
         case 0x2e:
         case 0x2f:
             aFontList.AppendElement(kFontEbrima);
             aFontList.AppendElement(kFontNyala);
             aFontList.AppendElement(kFontMeiryo);