Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 21:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=597147 part 4a: move latin-for-common bug 590114 workaround from font group to shaper so as not to disrupt fontconfig font selection language r=jfkthame

Browse Source 
--HG--
extra : transplant_source : %E4%29r%B2%84%3Bu%04C%07%EEm%AC%AD%7Ef%3DF%5Ee
This commit is contained in:
Karl Tomlinson 2010-11-08 11:44:51 +13:00
parent 1604a28622
commit 8b1f27b833
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/thebes/gfxFont.cpp
View File

@ -2188,13 +2188,6 @@ gfxFontGroup::InitTextRun(gfxContext *aContext,
PRUint32 runStart = 0, runLimit = aLength;
PRInt32 runScript = HB_SCRIPT_LATIN;
while (scriptRuns.Next(runStart, runLimit, runScript)) {
if (runScript <= HB_SCRIPT_INHERITED) {
// For unresolved "common" or "inherited" runs, default to Latin
// for now.
// (Should we somehow use the language or locale to try and infer
// a better default?)
runScript = HB_SCRIPT_LATIN;
}
InitTextRun(aContext, aTextRun, aString, aLength,
runStart, runLimit, runScript);
}

7
gfx/thebes/gfxHarfBuzzShaper.cpp
View File

@ -845,7 +845,12 @@ gfxHarfBuzzShaper::InitTextRun(gfxContext *aContext,
hb_buffer_set_direction(buffer,
aTextRun->IsRightToLeft() ?
HB_DIRECTION_RTL : HB_DIRECTION_LTR);
hb_buffer_set_script(buffer, hb_script_t(aRunScript));
// For unresolved "common" or "inherited" runs, default to Latin for now.
// (Should we somehow use the language or locale to try and infer
// a better default?)
hb_buffer_set_script(buffer,
aRunScript <= HB_SCRIPT_INHERITED ? HB_SCRIPT_LATIN
: hb_script_t(aRunScript));
hb_buffer_set_language(buffer, mHBLanguage);
hb_buffer_add_utf16(buffer, reinterpret_cast<const uint16_t*>(aString + aRunStart),