Bug 390740 - Pass lang-group into GetMetricsFor more consistently (general patch). r+sr=roc, a=dbaron

This commit is contained in:
sharparrow1@yahoo.com 2007-08-07 12:22:26 -07:00
parent fe9a203e49
commit 6cf1f63fec

View File

@ -1083,10 +1083,17 @@ nsresult
nsLayoutUtils::GetFontMetricsForFrame(nsIFrame* aFrame,
nsIFontMetrics** aFontMetrics)
{
nsStyleContext* sc = aFrame->GetStyleContext();
return aFrame->PresContext()->DeviceContext()->
GetMetricsFor(sc->GetStyleFont()->mFont,
sc->GetStyleVisibility()->mLangGroup,
return nsLayoutUtils::GetFontMetricsForStyleContext(aFrame->GetStyleContext(),
aFontMetrics);
}
nsresult
nsLayoutUtils::GetFontMetricsForStyleContext(nsStyleContext* aStyleContext,
nsIFontMetrics** aFontMetrics)
{
return aStyleContext->PresContext()->DeviceContext()->
GetMetricsFor(aStyleContext->GetStyleFont()->mFont,
aStyleContext->GetStyleVisibility()->mLangGroup,
*aFontMetrics);
}