author | Carsten "Tomcat" Book <cbook@mozilla.com> |
Tue, 12 May 2015 12:21:14 +0200 | |
changeset 243528 | fba5b3c2a1e890a9a6bd5a0985c55a086ef14018 |
parent 243527 | dc04168ea51eb1b4c0b8b93496a37fe650b82046 |
child 243529 | b376f7182133de81cf2b7a94cd2eac0f5c3f7ced |
push id | 28741 |
push user | kwierso@gmail.com |
push date | Tue, 12 May 2015 23:24:40 +0000 |
treeherder | mozilla-central@d476776d920d [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1056479 |
milestone | 40.0a1 |
backs out | c72465a4c4243a6d5ed436565f9ab80b2a0a5c9a |
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
|
--- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -377,49 +377,16 @@ static const char *gPrefLangNames[] = { "x-orya", "x-telu", "x-knda", "x-sinh", "x-tibt", "x-unicode", }; -// this needs to match the list of pref font.default.xx entries listed in all.js! -// the order *must* match the order in eFontPrefLang -static nsIAtom* gPrefLangToLangGroups[] = { - nsGkAtoms::x_western, - nsGkAtoms::Japanese, - nsGkAtoms::Taiwanese, - nsGkAtoms::Chinese, - nsGkAtoms::HongKongChinese, - nsGkAtoms::ko, - nsGkAtoms::x_cyrillic, - nsGkAtoms::el, - nsGkAtoms::th, - nsGkAtoms::he, - nsGkAtoms::ar, - nsGkAtoms::x_devanagari, - nsGkAtoms::x_tamil, - nsGkAtoms::x_armn, - nsGkAtoms::x_beng, - nsGkAtoms::x_cans, - nsGkAtoms::x_ethi, - nsGkAtoms::x_geor, - nsGkAtoms::x_gujr, - nsGkAtoms::x_guru, - nsGkAtoms::x_khmr, - nsGkAtoms::x_mlym, - nsGkAtoms::x_orya, - nsGkAtoms::x_telu, - nsGkAtoms::x_knda, - nsGkAtoms::x_sinh, - nsGkAtoms::x_tibt, - nsGkAtoms::Unicode -}; - gfxPlatform::gfxPlatform() : mTileWidth(-1) , mTileHeight(-1) , mAzureCanvasBackendCollector(this, &gfxPlatform::GetAzureBackendInfo) , mApzSupportCollector(this, &gfxPlatform::GetApzSupportInfo) { mAllowDownloadableFonts = UNINITIALIZED_VALUE; mFallbackUsesCmaps = UNINITIALIZED_VALUE; @@ -1502,29 +1469,16 @@ gfxPlatform::GetFontPrefLangFor(nsIAtom { if (!aLang) return eFontPrefLang_Others; nsAutoCString lang; aLang->ToUTF8String(lang); return GetFontPrefLangFor(lang.get()); } -nsIAtom* -gfxPlatform::GetLangGroupForPrefLang(eFontPrefLang aLang) -{ - // the special CJK set pref lang should be resolved into separate - // calls to individual CJK pref langs before getting here - NS_ASSERTION(aLang != eFontPrefLang_CJKSet, "unresolved CJK set pref lang"); - - if (uint32_t(aLang) < ArrayLength(gPrefLangToLangGroups)) { - return gPrefLangToLangGroups[uint32_t(aLang)]; - } - return nsGkAtoms::Unicode; -} - const char* gfxPlatform::GetPrefLangName(eFontPrefLang aLang) { if (uint32_t(aLang) < ArrayLength(gPrefLangNames)) { return gPrefLangNames[uint32_t(aLang)]; } return nullptr; }
--- a/gfx/thebes/gfxPlatform.h +++ b/gfx/thebes/gfxPlatform.h @@ -465,19 +465,16 @@ public: void *aClosure); // convert a lang group to enum constant (i.e. "zh-TW" ==> eFontPrefLang_ChineseTW) static eFontPrefLang GetFontPrefLangFor(const char* aLang); // convert a lang group atom to enum constant static eFontPrefLang GetFontPrefLangFor(nsIAtom *aLang); - // convert an enum constant to a lang group atom - static nsIAtom* GetLangGroupForPrefLang(eFontPrefLang aLang); - // convert a enum constant to lang group string (i.e. eFontPrefLang_ChineseTW ==> "zh-TW") static const char* GetPrefLangName(eFontPrefLang aLang); // map a Unicode range (based on char code) to a font language for Preferences static eFontPrefLang GetFontPrefLangFor(uint8_t aUnicodeRange); // returns true if a pref lang is CJK static bool IsLangCJK(eFontPrefLang aLang);
--- a/gfx/thebes/gfxTextRun.cpp +++ b/gfx/thebes/gfxTextRun.cpp @@ -3077,20 +3077,17 @@ struct PrefFontCallbackData { {} nsTArray<nsRefPtr<gfxFontFamily> >& mPrefFamilies; static bool AddFontFamilyEntry(eFontPrefLang aLang, const nsAString& aName, void *aClosure) { PrefFontCallbackData *prefFontData = static_cast<PrefFontCallbackData*>(aClosure); - // map pref lang to langGroup for language-sensitive lookups - nsIAtom* lang = gfxPlatform::GetLangGroupForPrefLang(aLang); - gfxFontFamily *family = - gfxPlatformFontList::PlatformFontList()->FindFamily(aName, lang); + gfxFontFamily *family = gfxPlatformFontList::PlatformFontList()->FindFamily(aName); if (family) { prefFontData->mPrefFamilies.AppendElement(family); } return true; } }; already_AddRefed<gfxFont>