mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 17:25:36 +00:00
Bug 1228501 patch 3 - Remove nsFont::BaseEquals. r=jdaggett
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.) --HG-- extra : commitid : JVYtDCoxqyH
This commit is contained in:
parent
5664cf9014
commit
f194309cac
@ -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) &&
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user