From f194309caca5919371b6a4db8943b63eff433b88 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Mon, 30 Nov 2015 14:02:25 -0800
Subject: [PATCH] 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
---
 gfx/src/nsFont.cpp             | 2 +-
 gfx/src/nsFont.h               | 7 +------
 layout/generic/nsTextFrame.cpp | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/gfx/src/nsFont.cpp b/gfx/src/nsFont.cpp
index f493633a9f6d..cd627be59002 100644
--- a/gfx/src/nsFont.cpp
+++ b/gfx/src/nsFont.cpp
@@ -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) &&
diff --git a/gfx/src/nsFont.h b/gfx/src/nsFont.h
index 68f1c2acb1ab..fb0cdf636142 100644
--- a/gfx/src/nsFont.h
+++ b/gfx/src/nsFont.h
@@ -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);
 
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index 8284f6031b8b..ee51495901c6 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -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);