Back out 0ed1ae70d922 (bug 1171357) for b2g emulator-l warnings-as-errors

CLOSED TREE
This commit is contained in:
Phil Ringnalda 2015-06-04 22:25:00 -07:00
Родитель bfbcf3c2b8
Коммит b7ac4b7da6
1 изменённых файлов: 10 добавлений и 37 удалений

Просмотреть файл

@ -2986,43 +2986,16 @@ void gfxFontGroup::ComputeRanges(nsTArray<gfxTextRange>& aRanges,
aRanges[lastRangeIndex].end = aLength; aRanges[lastRangeIndex].end = aLength;
#ifndef RELEASE_BUILD #if 0
PRLogModuleInfo *log = (mStyle.systemFont ? // dump out font matching info
gfxPlatform::GetLog(eGfxLog_textrunui) : if (mStyle.systemFont) return;
gfxPlatform::GetLog(eGfxLog_textrun));
if (MOZ_UNLIKELY(MOZ_LOG_TEST(log, LogLevel::Debug))) {
nsAutoCString lang;
mStyle.language->ToUTF8String(lang);
nsAutoString families;
mFamilyList.ToString(families);
// collect the font matched for each range
nsAutoCString fontMatches;
for (size_t i = 0, i_end = aRanges.Length(); i < i_end; i++) { for (size_t i = 0, i_end = aRanges.Length(); i < i_end; i++) {
char match[256];
const gfxTextRange& r = aRanges[i]; const gfxTextRange& r = aRanges[i];
sprintf(match, " [%u:%u] %.200s (%s)", printf("fontmatch %zd:%zd font: %s (%d)\n",
r.start, r.end, r.start, r.end,
(r.font.get() ? (r.font.get() ?
NS_ConvertUTF16toUTF8(r.font->GetName()).get() : "<null>"), NS_ConvertUTF16toUTF8(r.font->GetName()).get() : "<null>"),
(r.matchType == gfxTextRange::kFontGroup ? r.matchType);
"list" :
(r.matchType == gfxTextRange::kPrefsFallback) ?
"prefs" : "sys"));
fontMatches.Append(match);
}
MOZ_LOG(log, LogLevel::Debug,\
("(%s-fontmatching) fontgroup: [%s] default: %s lang: %s script: %d"
"%s\n",
(mStyle.systemFont ? "textrunui" : "textrun"),
NS_ConvertUTF16toUTF8(families).get(),
(mFamilyList.GetDefaultFontType() == eFamily_serif ?
"serif" :
(mFamilyList.GetDefaultFontType() == eFamily_sans_serif ?
"sans-serif" : "none")),
lang.get(), aRunScript,
fontMatches.get()));
} }
#endif #endif
} }