mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-04 19:33:18 +00:00
Bug 77942. Make font cache promote last hit to the front of the cache; only retrieve lang-atom if fonts are equal. r=dbaron, sr=hyatt
This commit is contained in:
parent
8537458995
commit
1a8ee3a219
@ -715,16 +715,24 @@ nsresult nsFontCache :: GetMetricsFor(const nsFont& aFont, nsIAtom* aLangGroup,
|
||||
|
||||
for (PRInt32 cnt = 0; cnt < n; cnt++)
|
||||
{
|
||||
aMetrics = (nsIFontMetrics*) mFontMetrics.ElementAt(cnt);
|
||||
nsIFontMetrics* metrics = NS_STATIC_CAST(nsIFontMetrics*, mFontMetrics[cnt]);
|
||||
|
||||
const nsFont* font;
|
||||
aMetrics->GetFont(font);
|
||||
nsCOMPtr<nsIAtom> langGroup;
|
||||
aMetrics->GetLangGroup(getter_AddRefs(langGroup));
|
||||
if (aFont.Equals(*font) && (aLangGroup == langGroup.get()))
|
||||
{
|
||||
NS_ADDREF(aMetrics);
|
||||
return NS_OK;
|
||||
metrics->GetFont(font);
|
||||
if (aFont.Equals(*font)) {
|
||||
nsCOMPtr<nsIAtom> langGroup;
|
||||
metrics->GetLangGroup(getter_AddRefs(langGroup));
|
||||
if (aLangGroup == langGroup.get()) {
|
||||
if (cnt != 0) {
|
||||
// promote it to the front of the cache
|
||||
for (PRInt32 i = cnt; i > 0; --i)
|
||||
mFontMetrics.ReplaceElementAt(mFontMetrics[i - 1], i);
|
||||
|
||||
mFontMetrics.ReplaceElementAt(metrics, 0);
|
||||
}
|
||||
NS_ADDREF(aMetrics = metrics);
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user