Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 174055, part 8: change GetLanguage to return a raw nsIAtom*.

Browse Source
This commit is contained in:
Zack Weinberg 2011-04-14 10:43:21 -07:00
parent d856f0c057
commit d9ffdcb05b
3 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/src/nsFontMetrics.cpp
View File

@ -268,14 +268,6 @@ nsFontMetrics::SpaceWidth()
return CEIL_TO_TWIPS(GetMetrics().spaceWidth);
}
already_AddRefed<nsIAtom>
nsFontMetrics::GetLanguage()
{
nsIAtom* result = mLanguage.get();
NS_IF_ADDREF(result);
return result;
}
PRInt32
nsFontMetrics::GetMaxStringLength()
{

2
gfx/src/nsFontMetrics.h
View File

@ -197,7 +197,7 @@ public:
/**
* Returns the language associated with these metrics
*/
already_AddRefed<nsIAtom> GetLanguage();
nsIAtom* Language() { return mLanguage; }
PRInt32 GetMaxStringLength();

20
gfx/src/nsThebesDeviceContext.cpp
View File

@ -150,18 +150,16 @@ nsFontCache::GetMetricsFor(const nsFont& aFont, nsIAtom* aLanguage,
PRInt32 n = mFontMetrics.Length() - 1;
for (PRInt32 i = n; i >= 0; --i) {
fm = mFontMetrics[i];
if (fm->Font().Equals(aFont) && fm->GetUserFontSet() == aUserFontSet) {
nsCOMPtr<nsIAtom> language = fm->GetLanguage();
if (aLanguage == language.get()) {
if (i != n) {
// promote it to the end of the cache
mFontMetrics.RemoveElementAt(i);
mFontMetrics.AppendElement(fm);
}
fm->GetThebesFontGroup()->UpdateFontList();
NS_ADDREF(aMetrics = fm);
return NS_OK;
if (fm->Font().Equals(aFont) && fm->GetUserFontSet() == aUserFontSet &&
fm->Language() == aLanguage) {
if (i != n) {
// promote it to the end of the cache
mFontMetrics.RemoveElementAt(i);
mFontMetrics.AppendElement(fm);
}
fm->GetThebesFontGroup()->UpdateFontList();
NS_ADDREF(aMetrics = fm);
return NS_OK;
}
}