wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset dc4ff3a5afd1 (bug 1031187)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-07-09 13:44:11 +02:00
parent 23d2987be3
commit ed60ddd832
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/thebes/gfxUserFontSet.cpp
View File

@ -351,7 +351,7 @@ gfxProxyFontEntry::LoadNext(gfxMixedFontFamily *aFamily,
LOG(("fontset (%p) [src %d] loaded local: (%s) for (%s) gen: %8.8x\n",
mFontSet, mSrcIndex,
NS_ConvertUTF16toUTF8(currSrc.mLocalName).get(),
NS_ConvertUTF16toUTF8(mFamilyName).get(),
NS_ConvertUTF16toUTF8(aFamily->Name()).get(),
uint32_t(mFontSet->mGeneration)));
fe->mFeatureSettings.AppendElements(mFeatureSettings);
fe->mLanguageOverride = mLanguageOverride;
@ -366,7 +366,7 @@ gfxProxyFontEntry::LoadNext(gfxMixedFontFamily *aFamily,
LOG(("fontset (%p) [src %d] failed local: (%s) for (%s)\n",
mFontSet, mSrcIndex,
NS_ConvertUTF16toUTF8(currSrc.mLocalName).get(),
NS_ConvertUTF16toUTF8(mFamilyName).get()));
NS_ConvertUTF16toUTF8(aFamily->Name()).get()));
}
}
@ -434,7 +434,7 @@ gfxProxyFontEntry::LoadNext(gfxMixedFontFamily *aFamily,
currSrc.mURI->GetSpec(fontURI);
LOG(("userfonts (%p) [src %d] loading uri: (%s) for (%s)\n",
mFontSet, mSrcIndex, fontURI.get(),
NS_ConvertUTF16toUTF8(mFamilyName).get()));
NS_ConvertUTF16toUTF8(aFamily->Name()).get()));
}
#endif
return STATUS_LOADING;
@ -466,7 +466,7 @@ gfxProxyFontEntry::LoadNext(gfxMixedFontFamily *aFamily,
// all src's failed; mark this entry as unusable (so fallback will occur)
LOG(("userfonts (%p) failed all src for (%s)\n",
mFontSet, NS_ConvertUTF16toUTF8(mFamilyName).get()));
mFontSet, NS_ConvertUTF16toUTF8(aFamily->Name()).get()));
mLoadingState = LOADING_FAILED;
return STATUS_END_OF_LIST;
@ -538,7 +538,7 @@ gfxProxyFontEntry::LoadFont(gfxMixedFontFamily *aFamily,
mSrcList[mSrcIndex].mURI->GetSpec(fontURI);
LOG(("userfonts (%p) [src %d] loaded uri: (%s) for (%s) gen: %8.8x\n",
this, mSrcIndex, fontURI.get(),
NS_ConvertUTF16toUTF8(mFamilyName).get(),
NS_ConvertUTF16toUTF8(aFamily->Name()).get(),
uint32_t(mFontSet->mGeneration)));
}
#endif
@ -552,7 +552,7 @@ gfxProxyFontEntry::LoadFont(gfxMixedFontFamily *aFamily,
LOG(("userfonts (%p) [src %d] failed uri: (%s) for (%s)"
" error making platform font\n",
this, mSrcIndex, fontURI.get(),
NS_ConvertUTF16toUTF8(mFamilyName).get()));
NS_ConvertUTF16toUTF8(aFamily->Name()).get()));
}
#endif
}

2
layout/style/nsFontFaceLoader.cpp
View File

@ -774,7 +774,7 @@ nsUserFontSet::LogMessage(gfxMixedFontFamily* aFamily,
return NS_ERROR_NOT_AVAILABLE;
}
NS_ConvertUTF16toUTF8 familyName(aProxy->mFamilyName);
NS_ConvertUTF16toUTF8 familyName(aFamily->Name());
nsAutoCString fontURI;
if (aProxy->mSrcIndex == aProxy->mSrcList.Length()) {
fontURI.AppendLiteral("(end of source list)");