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

Bug 91478. Don't incorporate mFlags when computing difference between two fonts. r=attinasi, sr=hyatt.

Browse Source
This commit is contained in:
waterson%netscape.com 2001-07-22 22:49:52 +00:00
parent 6430792e53
commit 810f67dd7a
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
content/shared/src/nsStyleStruct.cpp
View File

@ -209,14 +209,11 @@ nsStyleFont::Destroy(nsIPresContext* aContext) {
PRInt32 nsStyleFont::CalcDifference(const nsStyleFont& aOther) const
{
if (mFlags == aOther.mFlags) {
PRInt32 impact = CalcFontDifference(mFont, aOther.mFont);
if (impact < NS_STYLE_HINT_REFLOW) {
impact = CalcFontDifference(mFixedFont, aOther.mFixedFont);
}
return impact;
}
return NS_STYLE_HINT_REFLOW;
PRInt32 impact = CalcFontDifference(mFont, aOther.mFont);
if (impact < NS_STYLE_HINT_REFLOW) {
impact = CalcFontDifference(mFixedFont, aOther.mFixedFont);
}
return impact;
}
PRInt32 nsStyleFont::CalcFontDifference(const nsFont& aFont1, const nsFont& aFont2)

13
layout/style/nsStyleStruct.cpp
View File

@ -209,14 +209,11 @@ nsStyleFont::Destroy(nsIPresContext* aContext) {
PRInt32 nsStyleFont::CalcDifference(const nsStyleFont& aOther) const
{
if (mFlags == aOther.mFlags) {
PRInt32 impact = CalcFontDifference(mFont, aOther.mFont);
if (impact < NS_STYLE_HINT_REFLOW) {
impact = CalcFontDifference(mFixedFont, aOther.mFixedFont);
}
return impact;
}
return NS_STYLE_HINT_REFLOW;
PRInt32 impact = CalcFontDifference(mFont, aOther.mFont);
if (impact < NS_STYLE_HINT_REFLOW) {
impact = CalcFontDifference(mFixedFont, aOther.mFixedFont);
}
return impact;
}
PRInt32 nsStyleFont::CalcFontDifference(const nsFont& aFont1, const nsFont& aFont2)