Bug 235335. Additional changes. r+sr=bryner

content/shared/public/nsFrameManager.h

@@ -49,6 +49,8 @@
  * <li>handles structural modifications to the frame model. If the frame model
  * lock can be acquired, then the changes are processed immediately; otherwise,
  * they're queued and processed later.
+ *
+ * Do not add virtual methods to this class, or bryner will punish you.
  */
 
 class nsFrameManager : public nsFrameManagerBase
@@ -64,8 +66,6 @@ public:
     return aHost->FrameManager();
   }
 
-  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-
   // Initialization
   NS_HIDDEN_(nsresult) Init(nsIPresShell* aPresShell, nsStyleSet* aStyleSet);
 

content/shared/public/nsFrameManagerBase.h

@@ -51,9 +51,6 @@ struct CantRenderReplacedElementEvent;
 class nsFrameManagerBase
 {
 public:
-  // force a vtable entry
-  virtual ~nsFrameManagerBase() {}
-
   struct PropertyList;
 
 protected:

layout/base/nsFrameManager.h

@@ -49,6 +49,8 @@
  * <li>handles structural modifications to the frame model. If the frame model
  * lock can be acquired, then the changes are processed immediately; otherwise,
  * they're queued and processed later.
+ *
+ * Do not add virtual methods to this class, or bryner will punish you.
  */
 
 class nsFrameManager : public nsFrameManagerBase
@@ -64,8 +66,6 @@ public:
     return aHost->FrameManager();
   }
 
-  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-
   // Initialization
   NS_HIDDEN_(nsresult) Init(nsIPresShell* aPresShell, nsStyleSet* aStyleSet);
 

layout/base/nsFrameManagerBase.h

@@ -51,9 +51,6 @@ struct CantRenderReplacedElementEvent;
 class nsFrameManagerBase
 {
 public:
-  // force a vtable entry
-  virtual ~nsFrameManagerBase() {}
-
   struct PropertyList;
 
 protected: