wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1228501 patch 3 - Remove nsFont::BaseEquals. r=jdaggett

Browse Source 
BaseEquals and Equals were made the same by patch 2, so BaseEquals can
be removed.

(operator== is also defined as an inlined call to Equals.)
This commit is contained in:
L. David Baron 2015-11-30 14:02:25 -08:00
parent f7211c91ad
commit 6ef55cfb63
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/src/nsFont.cpp
View File

@ -89,7 +89,7 @@ nsFont::~nsFont()
{
}
bool nsFont::BaseEquals(const nsFont& aOther) const
bool nsFont::Equals(const nsFont& aOther) const
{
if ((style == aOther.style) &&
(systemFont == aOther.systemFont) &&

7
gfx/src/nsFont.h
View File

@ -123,12 +123,7 @@ struct nsFont {
return Equals(aOther);
}
// FIXME (in patch 3): These are now the same. Remove BaseEquals!
bool Equals(const nsFont& aOther) const
{
return BaseEquals(aOther);
}
bool BaseEquals(const nsFont& aOther) const;
bool Equals(const nsFont& aOther) const;
nsFont& operator=(const nsFont& aOther);

4
layout/generic/nsTextFrame.cpp
View File

@ -1709,8 +1709,8 @@ BuildTextRunsScanner::ContinueTextRunAcrossFrames(nsTextFrame* aFrame1, nsTextFr
const nsStyleFont* fontStyle2 = sc2->StyleFont();
nscoord letterSpacing1 = LetterSpacing(aFrame1);
nscoord letterSpacing2 = LetterSpacing(aFrame2);
return fontStyle1->mFont.BaseEquals(fontStyle2->mFont) &&
sc1->StyleFont()->mLanguage == sc2->StyleFont()->mLanguage &&
return fontStyle1->mFont == fontStyle2->mFont &&
fontStyle1->mLanguage == fontStyle2->mLanguage &&
textStyle1->mTextTransform == textStyle2->mTextTransform &&
nsLayoutUtils::GetTextRunFlagsForStyle(sc1, fontStyle1, textStyle1, letterSpacing1) ==
nsLayoutUtils::GetTextRunFlagsForStyle(sc2, fontStyle2, textStyle2, letterSpacing2);