Backout bug 1386480 for causing bug 1391410

editor/libeditor/SelectionState.cpp

@@ -647,6 +647,10 @@ RangeItem::~RangeItem()
 {
 }
 
+NS_IMPL_CYCLE_COLLECTION(RangeItem, mStartContainer, mEndContainer)
+NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(RangeItem, AddRef)
+NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(RangeItem, Release)
+
 void
 RangeItem::StoreRange(nsRange* aRange)
 {
@@ -668,18 +672,4 @@ RangeItem::GetRange()
   return range.forget();
 }
 
-void
-RangeItem::Unlink()
-{
-  ImplCycleCollectionUnlink(mStartContainer);
-  ImplCycleCollectionUnlink(mEndContainer);
-}
-
-void
-RangeItem::Traverse(nsCycleCollectionTraversalCallback& aCallback, uint32_t aFlags)
-{
-  CycleCollectionNoteChild(aCallback, mStartContainer.get(), "mStartContainer", aFlags);
-  CycleCollectionNoteChild(aCallback, mEndContainer.get(), "mEndContainer", aFlags);
-}
-
 } // namespace mozilla

editor/libeditor/SelectionState.h

@@ -37,10 +37,8 @@ public:
   void StoreRange(nsRange* aRange);
   already_AddRefed<nsRange> GetRange();
 
-  NS_INLINE_DECL_REFCOUNTING(RangeItem)
-
-  void Unlink();
-  void Traverse(nsCycleCollectionTraversalCallback& aCallback, uint32_t aFlags);
+  NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(RangeItem)
+  NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(RangeItem)
 
   nsCOMPtr<nsINode> mStartContainer;
   int32_t mStartOffset;
@@ -48,36 +46,6 @@ public:
   int32_t mEndOffset;
 };
 
-inline void
-ImplCycleCollectionUnlink(RangeItem& aItem)
-{
-  aItem.Unlink();
-}
-
-inline void
-ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
-                            RangeItem& aItem,
-                            const char* aName,
-                            uint32_t aFlags = 0)
-{
-  aItem.Traverse(aCallback, aFlags);
-}
-
-inline void
-ImplCycleCollectionUnlink(RefPtr<RangeItem>& aItem)
-{
-  aItem->Unlink();
-}
-
-inline void
-ImplCycleCollectionTraverse(nsCycleCollectionTraversalCallback& aCallback,
-                            RefPtr<RangeItem>& aItem,
-                            const char* aName,
-                            uint32_t aFlags = 0)
-{
-  aItem->Traverse(aCallback, aFlags);
-}
-
 /**
  * mozilla::SelectionState
  *