Backed out changeset c081917e5626 (bug 1022612)

layout/base/nsDisplayList.cpp

@@ -2990,8 +2990,6 @@ nsDisplayWrapList::nsDisplayWrapList(nsDisplayListBuilder* aBuilder,
   : nsDisplayItem(aBuilder, aFrame)
   , mOverrideZIndex(0)
 {
-  MOZ_COUNT_CTOR(nsDisplayWrapList);
-
   mList.AppendToTop(aList);
   UpdateBounds(aBuilder);
 
@@ -3036,8 +3034,6 @@ nsDisplayWrapList::nsDisplayWrapList(nsDisplayListBuilder* aBuilder,
   : nsDisplayItem(aBuilder, aFrame)
   , mOverrideZIndex(0)
 {
-  MOZ_COUNT_CTOR(nsDisplayWrapList);
-
   mList.AppendToTop(aItem);
   UpdateBounds(aBuilder);
   
@@ -3061,8 +3057,6 @@ nsDisplayWrapList::nsDisplayWrapList(nsDisplayListBuilder* aBuilder,
 
 nsDisplayWrapList::~nsDisplayWrapList() {
   mList.DeleteAll();
-
-  MOZ_COUNT_DTOR(nsDisplayWrapList);
 }
 
 void

layout/base/nsDisplayList.h

@@ -2568,6 +2568,9 @@ private:
  * detect and handle this case.
  */
 class nsDisplayWrapList : public nsDisplayItem {
+  // This is never instantiated directly, so no need to count constructors and
+  // destructors.
+
 public:
   /**
    * Takes all the items from aList and puts them in our list.
@@ -2577,10 +2580,7 @@ public:
   nsDisplayWrapList(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
                     nsDisplayItem* aItem);
   nsDisplayWrapList(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame)
-    : nsDisplayItem(aBuilder, aFrame), mOverrideZIndex(0)
-  {
-    MOZ_COUNT_CTOR(nsDisplayWrapList);
-  }
+    : nsDisplayItem(aBuilder, aFrame), mOverrideZIndex(0) {}
   virtual ~nsDisplayWrapList();
   /**
    * Call this if the wrapped list is changed.