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

Cache data to improve performance in GetMacFontNumber()

Browse Source
This commit is contained in:
pierre%netscape.com 1998-11-04 06:49:14 +00:00
parent a9e64e7020
commit a6268eee92
2 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gfx/src/mac/nsDeviceContextMac.cpp
View File

@ -158,25 +158,42 @@ NS_IMETHODIMP nsDeviceContextMac :: CheckFontExistence(const nsString& aFontName
//------------------------------------------------------------------------
bool nsDeviceContextMac :: GetMacFontNumber(const nsString& aFontName, short &fontNum)
bool nsDeviceContextMac :: GetMacFontNumber(const nsString& aFontName, short &aFontNum)
{
//¥TODO: We need to optimize this. Some kind of caching would be nice.
Str255 systemFontName;
Str255 aStr;
bool fontExists;
//¥TODO?: Maybe we shouldn't call that function so often. If nsFont could store the
// fontNum, nsFontMetricsMac::SetFont() wouldn't need to call this at all.
static nsString lastFontName;
static short lastFontNum;
static bool lastFontExists;
if (lastFontName == aFontName)
{
aFontNum = lastFontNum;
return lastFontExists;
}
aStr[0] = aFontName.Length();
aFontName.ToCString((char*)&aStr[1], sizeof(aStr)-1);
::GetFNum(aStr, &fontNum);
if (fontNum == 0)
::GetFNum(aStr, &aFontNum);
if (aFontNum == 0)
{
// Either we didn't find the font, or we were looking for the system font
::GetFontName(0, systemFontName);
return ::EqualString(aStr, systemFontName, FALSE, FALSE );
fontExists = ::EqualString(aStr, systemFontName, FALSE, FALSE );
}
else
return true;
fontExists = true;
lastFontExists = fontExists;
lastFontNum = aFontNum;
lastFontName = aFontName;
return fontExists;
}
//------------------------------------------------------------------------

31
widget/src/mac/nsDeviceContextMac.cpp
View File

@ -158,25 +158,42 @@ NS_IMETHODIMP nsDeviceContextMac :: CheckFontExistence(const nsString& aFontName
//------------------------------------------------------------------------
bool nsDeviceContextMac :: GetMacFontNumber(const nsString& aFontName, short &fontNum)
bool nsDeviceContextMac :: GetMacFontNumber(const nsString& aFontName, short &aFontNum)
{
//¥TODO: We need to optimize this. Some kind of caching would be nice.
Str255 systemFontName;
Str255 aStr;
bool fontExists;
//¥TODO?: Maybe we shouldn't call that function so often. If nsFont could store the
// fontNum, nsFontMetricsMac::SetFont() wouldn't need to call this at all.
static nsString lastFontName;
static short lastFontNum;
static bool lastFontExists;
if (lastFontName == aFontName)
{
aFontNum = lastFontNum;
return lastFontExists;
}
aStr[0] = aFontName.Length();
aFontName.ToCString((char*)&aStr[1], sizeof(aStr)-1);
::GetFNum(aStr, &fontNum);
if (fontNum == 0)
::GetFNum(aStr, &aFontNum);
if (aFontNum == 0)
{
// Either we didn't find the font, or we were looking for the system font
::GetFontName(0, systemFontName);
return ::EqualString(aStr, systemFontName, FALSE, FALSE );
fontExists = ::EqualString(aStr, systemFontName, FALSE, FALSE );
}
else
return true;
fontExists = true;
lastFontExists = fontExists;
lastFontNum = aFontNum;
lastFontName = aFontName;
return fontExists;
}
//------------------------------------------------------------------------