Bug 1266341 - Pass the right kind of enum constants for script codes. r=masayuki
authorJonathan Kew <jkew@mozilla.com>
Thu, 21 Apr 2016 16:31:46 +0100
changeset 332211 b41c3ceb94d42a39b31349e6e29b227521fc15b8
parent 332210 cdcf362a0234ad70425b14c4d58568d7bd66381b
child 332212 954e40c927979cc5569e2247ad632d5c0874a5f6
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki
bugs1266341
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1266341 - Pass the right kind of enum constants for script codes. r=masayuki
gfx/thebes/gfxTextRun.cpp
layout/generic/MathMLTextRunFactory.cpp
--- a/gfx/thebes/gfxTextRun.cpp
+++ b/gfx/thebes/gfxTextRun.cpp
@@ -2827,17 +2827,17 @@ gfxFontGroup::FindFontForChar(uint32_t a
     // -- before searching for something else check the font used for the previous character
     if (aPrevMatchedFont && aPrevMatchedFont->HasCharacter(aCh)) {
         *aMatchType = gfxTextRange::kSystemFallback;
         RefPtr<gfxFont> ret = aPrevMatchedFont;
         return ret.forget();
     }
 
     // never fall back for characters from unknown scripts
-    if (aRunScript == HB_SCRIPT_UNKNOWN) {
+    if (aRunScript == MOZ_SCRIPT_UNKNOWN) {
         return nullptr;
     }
 
     // for known "space" characters, don't do a full system-fallback search;
     // we'll synthesize appropriate-width spaces instead of missing-glyph boxes
     if (GetGeneralCategory(aCh) ==
             HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR &&
         GetFirstValidFont()->SynthesizeSpaceWidth(aCh) >= 0.0)
--- a/layout/generic/MathMLTextRunFactory.cpp
+++ b/layout/generic/MathMLTextRunFactory.cpp
@@ -664,17 +664,17 @@ MathMLTextRunFactory::RebuildTextRun(nsT
         doMathvariantStyling = false;
       }
       if (ch2 != ch) {
         // Bug 930504. Some platforms do not have fonts for Mathematical
         // Alphanumeric Symbols. Hence we check whether the transformed
         // character is actually available.
         uint8_t matchType;
         RefPtr<gfxFont> mathFont = fontGroup->
-          FindFontForChar(ch2, 0, 0, HB_SCRIPT_COMMON, nullptr, &matchType);
+          FindFontForChar(ch2, 0, 0, MOZ_SCRIPT_COMMON, nullptr, &matchType);
         if (mathFont) {
           // Don't apply the CSS style if there is a math font for at least one
           // of the transformed character in this text run.
           doMathvariantStyling = false;
         } else {
           // We fallback to the original character.
           ch2 = ch;
           if (aMFR) {