Bug 1454503: Remove unused RestyleManager refcounting. r=xidorn

MozReview-Commit-ID: DILRptmC8wJ

layout/base/RestyleManager.h

@@ -189,8 +189,6 @@ public:
   typedef ServoElementSnapshotTable SnapshotTable;
   typedef mozilla::dom::Element Element;
 
-  NS_INLINE_DECL_REFCOUNTING(mozilla::RestyleManager)
-
   // Get an integer that increments every time we process pending restyles.
   // The value is never 0.
   uint64_t GetRestyleGeneration() const { return mRestyleGeneration; }
@@ -204,6 +202,13 @@ public:
 
   void Disconnect() { mPresContext = nullptr; }
 
+  ~RestyleManager()
+  {
+    MOZ_ASSERT(!mAnimationsWithDestroyedFrame,
+               "leaving dangling pointers from AnimationsWithDestroyedFrame");
+    MOZ_ASSERT(!mReentrantChanges);
+  }
+
   static nsCString RestyleHintToString(nsRestyleHint aHint);
 
 #ifdef DEBUG
@@ -449,13 +454,6 @@ protected:
 
   ServoStyleSet* StyleSet() const { return PresContext()->StyleSet(); }
 
-  ~RestyleManager()
-  {
-    MOZ_ASSERT(!mAnimationsWithDestroyedFrame,
-               "leaving dangling pointers from AnimationsWithDestroyedFrame");
-    MOZ_ASSERT(!mReentrantChanges);
-  }
-
   void RestyleForEmptyChange(Element* aContainer);
   void MaybeRestyleForEdgeChildChange(Element* aContainer, nsIContent* aChangedChild);
 

layout/base/nsPresContext.cpp

@@ -956,7 +956,7 @@ nsPresContext::AttachShell(nsIPresShell* aShell)
   MOZ_ASSERT(!mShell);
   mShell = aShell;
 
-  mRestyleManager = new mozilla::RestyleManager(this);
+  mRestyleManager = MakeUnique<mozilla::RestyleManager>(this);
 
   // Since CounterStyleManager is also the name of a method of
   // nsPresContext, it is necessary to prefix the class with the mozilla

layout/base/nsPresContext.h

@@ -247,7 +247,7 @@ public:
 
   mozilla::RestyleManager* RestyleManager() {
     MOZ_ASSERT(mRestyleManager);
-    return mRestyleManager;
+    return mRestyleManager.get();
   }
 
   mozilla::CounterStyleManager* CounterStyleManager() const {
@@ -1300,7 +1300,7 @@ protected:
   RefPtr<mozilla::EffectCompositor> mEffectCompositor;
   RefPtr<nsTransitionManager> mTransitionManager;
   RefPtr<nsAnimationManager> mAnimationManager;
-  RefPtr<mozilla::RestyleManager> mRestyleManager;
+  mozilla::UniquePtr<mozilla::RestyleManager> mRestyleManager;
   RefPtr<mozilla::CounterStyleManager> mCounterStyleManager;
   nsAtom* MOZ_UNSAFE_REF("always a static atom") mMedium; // initialized by subclass ctors
   RefPtr<nsAtom> mMediaEmulated;