From aa95f86b98e6e836a7b181ea32b866c4c96a991c Mon Sep 17 00:00:00 2001
From: Cameron McCormack <cam@mcc.id.au>
Date: Fri, 21 Jul 2017 11:42:44 +0800
Subject: [PATCH] Bug 1380133 - Part 7: De-templatize
 CalcStyleDifference(Internal). r=emilio

MozReview-Commit-ID: 8c1E1gbwaHz
---
 layout/style/nsStyleContext.cpp | 23 +++++------------------
 layout/style/nsStyleContext.h   |  7 -------
 2 files changed, 5 insertions(+), 25 deletions(-)

--HG--
extra : rebase_source : 0280187becf0f35bc7c5ceb272babd6e0adbb3ff
---
 layout/style/nsStyleContext.cpp | 23 +++++------------------
 layout/style/nsStyleContext.h   |  7 -------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/layout/style/nsStyleContext.cpp b/layout/style/nsStyleContext.cpp
index 0905a23b50b5..fc0c7cb7cafb 100644
--- a/layout/style/nsStyleContext.cpp
+++ b/layout/style/nsStyleContext.cpp
@@ -185,14 +185,13 @@ nsStyleContext::MoveTo(nsStyleContext* aNewParent)
   }
 }
 
-template<class StyleContextLike>
 nsChangeHint
-nsStyleContext::CalcStyleDifferenceInternal(StyleContextLike* aNewContext,
-                                            uint32_t* aEqualStructs,
-                                            uint32_t* aSamePointerStructs,
-                                            uint32_t aRelevantStructs)
+nsStyleContext::CalcStyleDifference(nsStyleContext* aNewContext,
+                                    uint32_t* aEqualStructs,
+                                    uint32_t* aSamePointerStructs,
+                                    uint32_t aRelevantStructs)
 {
-  AUTO_PROFILER_LABEL("nsStyleContext::CalcStyleDifferenceInternal", CSS);
+  AUTO_PROFILER_LABEL("nsStyleContext::CalcStyleDifference", CSS);
 
   static_assert(nsStyleStructID_Length <= 32,
                 "aEqualStructs is not big enough");
@@ -447,18 +446,6 @@ nsStyleContext::CalcStyleDifferenceInternal(StyleContextLike* aNewContext,
   return hint & ~nsChangeHint_NeutralChange;
 }
 
-nsChangeHint
-nsStyleContext::CalcStyleDifference(nsStyleContext* aNewContext,
-                                    uint32_t* aEqualStructs,
-                                    uint32_t* aSamePointerStructs,
-                                    uint32_t aRelevantStructs)
-{
-  return CalcStyleDifferenceInternal(aNewContext,
-                                     aEqualStructs,
-                                     aSamePointerStructs,
-                                     aRelevantStructs);
-}
-
 namespace mozilla {
 
 void
diff --git a/layout/style/nsStyleContext.h b/layout/style/nsStyleContext.h
index a9b8dbf88bc9..44737f784f96 100644
--- a/layout/style/nsStyleContext.h
+++ b/layout/style/nsStyleContext.h
@@ -287,13 +287,6 @@ public:
                                    uint32_t aRelevantStructs =
                                      kAllResolvedStructs);
 
-private:
-  template<class StyleContextLike>
-  nsChangeHint CalcStyleDifferenceInternal(StyleContextLike* aNewContext,
-                                           uint32_t* aEqualStructs,
-                                           uint32_t* aSamePointerStructs,
-                                           uint32_t aRelevantStructs);
-
 public:
   /**
    * Get a color that depends on link-visitedness using this and