fixed up operator new usage

content/base/src/nsStyleContext.cpp

@@ -691,17 +691,7 @@ public:
                    nsIPresContext* aPresContext);
   virtual ~StyleContextImpl();
 
-  void* operator new(size_t size) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = ::operator new(size);
-    if (rv) {
-      nsCRT::zero(rv, size);
-    }
-    return rv;
-  }
-
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
 
   NS_DECL_ISUPPORTS
 

content/html/document/src/nsHTMLContentSink.cpp

@@ -139,21 +139,11 @@ class SinkContext;
 
 class HTMLContentSink : public nsIHTMLContentSink {
 public:
-  void* operator new(size_t size) {
-    void* rv = ::operator new(size);
-    if (rv) {
-      nsCRT::zero(rv, size);
-    }
-    return rv;
-  }
-
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
-
   HTMLContentSink();
   virtual ~HTMLContentSink();
 
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
   nsresult Init(nsIDocument* aDoc,
                 nsIURL* aURL,
                 nsIWebShell* aContainer);

content/html/style/src/nsCSSDeclaration.cpp

@@ -618,13 +618,11 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
-  void* operator new(size_t size);
-
-  void operator delete(void* ptr);
-  
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
 
+  NS_DECL_ZEROING_OPERATOR_NEW
+
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD GetData(const nsID& aSID, nsCSSStruct** aData);
@@ -685,19 +683,7 @@ static PRInt32 gInstanceCount;
 #endif
 
 
-void* CSSDeclarationImpl::operator new(size_t size)
+NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl)
-{
-  void* result = ::operator new(size);
-  if (result) {
-    nsCRT::zero(result, size);
-  }
-  return result;
-}
-
-void CSSDeclarationImpl::operator delete(void* ptr)
-{
-  ::operator delete(ptr);
-}
 
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {

content/html/style/src/nsCSSStruct.cpp

@@ -618,13 +618,11 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
-  void* operator new(size_t size);
-
-  void operator delete(void* ptr);
-  
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
 
+  NS_DECL_ZEROING_OPERATOR_NEW
+
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD GetData(const nsID& aSID, nsCSSStruct** aData);
@@ -685,19 +683,7 @@ static PRInt32 gInstanceCount;
 #endif
 
 
-void* CSSDeclarationImpl::operator new(size_t size)
+NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl)
-{
-  void* result = ::operator new(size);
-  if (result) {
-    nsCRT::zero(result, size);
-  }
-  return result;
-}
-
-void CSSDeclarationImpl::operator delete(void* ptr)
-{
-  ::operator delete(ptr);
-}
 
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {

docshell/base/nsWebShell.cpp

@@ -130,11 +130,7 @@ public:
   nsWebShell();
   virtual ~nsWebShell();
 
-  void* operator new(size_t sz) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = new char[sz];
-    nsCRT::zero(rv, sz);
-    return rv;
-  }
 
   // nsISupports
   NS_DECL_ISUPPORTS

htmlparser/tests/grabpage/grabpage.cpp

@@ -138,11 +138,7 @@ public:
   PageGrabber();
   ~PageGrabber();
 
-  void* operator new(size_t size) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = ::operator new(size);
-    nsCRT::zero(rv, size);
-    return (void*) rv;
-  }
 
   nsresult Init(const nsString& aDirectory);
 

layout/base/nsPresShell.cpp

@@ -190,17 +190,7 @@ class PresShell : public nsIPresShell, public nsIViewObserver,
 public:
   PresShell();
 
-  void* operator new(size_t size) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* result = ::operator new(size);
-    if (result) {
-      nsCRT::zero(result, size);
-    }
-    return result;
-  }
-
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
 
   // nsISupports
   NS_DECL_ISUPPORTS

layout/base/src/nsPresContext.h

@@ -28,17 +28,7 @@ class nsIImageGroup;
 // Base class for concrete presentation context classes
 class nsPresContext : public nsIPresContext {
 public:
-  void* operator new(size_t size) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = ::operator new(size);
-    if (rv) {
-      nsCRT::zero(rv, size);
-    }
-    return rv;
-  }
-
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
 
   // nsISupports methods
   NS_DECL_ISUPPORTS

layout/base/src/nsStyleContext.cpp

@@ -691,17 +691,7 @@ public:
                    nsIPresContext* aPresContext);
   virtual ~StyleContextImpl();
 
-  void* operator new(size_t size) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = ::operator new(size);
-    if (rv) {
-      nsCRT::zero(rv, size);
-    }
-    return rv;
-  }
-
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
 
   NS_DECL_ISUPPORTS
 

layout/generic/nsFrame.cpp

@@ -159,19 +159,7 @@ NS_NewEmptyFrame(nsIFrame**  aInstancePtrResult)
   return NS_OK;
 }
 
-void* nsFrame::operator new(size_t size)
+NS_IMPL_ZEROING_OPERATOR_NEW(nsFrame)
-{
-  void* result = ::operator new(size);
-  if (result) {
-    nsCRT::zero(result, size);
-  }
-  return result;
-}
-
-void nsFrame::operator delete(void* ptr)
-{
-  ::operator delete(ptr);
-}
 
 nsFrame::nsFrame()
 {

layout/generic/nsFrame.h

@@ -104,9 +104,7 @@ public:
   friend nsresult NS_NewEmptyFrame(nsIFrame** aInstancePtrResult);
 
   // Overloaded new operator. Initializes the memory to 0
-  void* operator new(size_t size);
+  NS_DECL_ZEROING_OPERATOR_NEW
-
-  void operator delete(void* ptr);
 
   // nsISupports
   NS_IMETHOD  QueryInterface(const nsIID& aIID, void** aInstancePtr);

layout/html/base/src/nsFrame.cpp

@@ -159,19 +159,7 @@ NS_NewEmptyFrame(nsIFrame**  aInstancePtrResult)
   return NS_OK;
 }
 
-void* nsFrame::operator new(size_t size)
+NS_IMPL_ZEROING_OPERATOR_NEW(nsFrame)
-{
-  void* result = ::operator new(size);
-  if (result) {
-    nsCRT::zero(result, size);
-  }
-  return result;
-}
-
-void nsFrame::operator delete(void* ptr)
-{
-  ::operator delete(ptr);
-}
 
 nsFrame::nsFrame()
 {

layout/html/base/src/nsFrame.h

@@ -104,9 +104,7 @@ public:
   friend nsresult NS_NewEmptyFrame(nsIFrame** aInstancePtrResult);
 
   // Overloaded new operator. Initializes the memory to 0
-  void* operator new(size_t size);
+  NS_DECL_ZEROING_OPERATOR_NEW
-
-  void operator delete(void* ptr);
 
   // nsISupports
   NS_IMETHOD  QueryInterface(const nsIID& aIID, void** aInstancePtr);

layout/html/base/src/nsPresShell.cpp

@@ -190,17 +190,7 @@ class PresShell : public nsIPresShell, public nsIViewObserver,
 public:
   PresShell();
 
-  void* operator new(size_t size) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* result = ::operator new(size);
-    if (result) {
-      nsCRT::zero(result, size);
-    }
-    return result;
-  }
-
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
 
   // nsISupports
   NS_DECL_ISUPPORTS

layout/html/document/src/nsHTMLContentSink.cpp

@@ -139,21 +139,11 @@ class SinkContext;
 
 class HTMLContentSink : public nsIHTMLContentSink {
 public:
-  void* operator new(size_t size) {
-    void* rv = ::operator new(size);
-    if (rv) {
-      nsCRT::zero(rv, size);
-    }
-    return rv;
-  }
-
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
-
   HTMLContentSink();
   virtual ~HTMLContentSink();
 
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
+
   nsresult Init(nsIDocument* aDoc,
                 nsIURL* aURL,
                 nsIWebShell* aContainer);

layout/html/style/src/nsCSSDeclaration.cpp

@@ -618,13 +618,11 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
-  void* operator new(size_t size);
-
-  void operator delete(void* ptr);
-  
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
 
+  NS_DECL_ZEROING_OPERATOR_NEW
+
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD GetData(const nsID& aSID, nsCSSStruct** aData);
@@ -685,19 +683,7 @@ static PRInt32 gInstanceCount;
 #endif
 
 
-void* CSSDeclarationImpl::operator new(size_t size)
+NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl)
-{
-  void* result = ::operator new(size);
-  if (result) {
-    nsCRT::zero(result, size);
-  }
-  return result;
-}
-
-void CSSDeclarationImpl::operator delete(void* ptr)
-{
-  ::operator delete(ptr);
-}
 
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {

layout/style/nsCSSDeclaration.cpp

@@ -618,13 +618,11 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
-  void* operator new(size_t size);
-
-  void operator delete(void* ptr);
-  
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
 
+  NS_DECL_ZEROING_OPERATOR_NEW
+
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD GetData(const nsID& aSID, nsCSSStruct** aData);
@@ -685,19 +683,7 @@ static PRInt32 gInstanceCount;
 #endif
 
 
-void* CSSDeclarationImpl::operator new(size_t size)
+NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl)
-{
-  void* result = ::operator new(size);
-  if (result) {
-    nsCRT::zero(result, size);
-  }
-  return result;
-}
-
-void CSSDeclarationImpl::operator delete(void* ptr)
-{
-  ::operator delete(ptr);
-}
 
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {

layout/style/nsCSSStruct.cpp

@@ -618,13 +618,11 @@ void nsCSSAural::List(FILE* out, PRInt32 aIndent) const
 
 class CSSDeclarationImpl : public nsICSSDeclaration {
 public:
-  void* operator new(size_t size);
-
-  void operator delete(void* ptr);
-  
   CSSDeclarationImpl(void);
   virtual ~CSSDeclarationImpl(void);
 
+  NS_DECL_ZEROING_OPERATOR_NEW
+
   NS_DECL_ISUPPORTS
 
   NS_IMETHOD GetData(const nsID& aSID, nsCSSStruct** aData);
@@ -685,19 +683,7 @@ static PRInt32 gInstanceCount;
 #endif
 
 
-void* CSSDeclarationImpl::operator new(size_t size)
+NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl)
-{
-  void* result = ::operator new(size);
-  if (result) {
-    nsCRT::zero(result, size);
-  }
-  return result;
-}
-
-void CSSDeclarationImpl::operator delete(void* ptr)
-{
-  ::operator delete(ptr);
-}
 
 CSSDeclarationImpl::CSSDeclarationImpl(void)
 {

layout/style/nsStyleContext.cpp

@@ -691,17 +691,7 @@ public:
                    nsIPresContext* aPresContext);
   virtual ~StyleContextImpl();
 
-  void* operator new(size_t size) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = ::operator new(size);
-    if (rv) {
-      nsCRT::zero(rv, size);
-    }
-    return rv;
-  }
-
-  void operator delete(void* ptr) {
-    ::operator delete(ptr);
-  }
 
   NS_DECL_ISUPPORTS
 

parser/htmlparser/tests/grabpage/grabpage.cpp

@@ -138,11 +138,7 @@ public:
   PageGrabber();
   ~PageGrabber();
 
-  void* operator new(size_t size) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = ::operator new(size);
-    nsCRT::zero(rv, size);
-    return (void*) rv;
-  }
 
   nsresult Init(const nsString& aDirectory);
 

webshell/src/nsDocumentViewer.cpp

@@ -62,11 +62,7 @@ public:
     DocumentViewerImpl();
     DocumentViewerImpl(nsIPresContext* aPresContext);
   
-    void* operator new(size_t sz) {
+    NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-        void* rv = new char[sz];
-        nsCRT::zero(rv, sz);
-        return rv;
-    }
 
     // nsISupports interface...
     NS_DECL_ISUPPORTS

webshell/src/nsPluginViewer.cpp

@@ -109,11 +109,7 @@ class PluginViewerImpl : public nsIContentViewer
 public:
   PluginViewerImpl(const char* aCommand, nsIStreamListener** aDocListener);
     
-  void* operator new(size_t sz) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = new char[sz];
-    nsCRT::zero(rv, sz);
-    return rv;
-  }
 
   // nsISupports
   NS_DECL_ISUPPORTS

webshell/src/nsThrobber.cpp

@@ -58,11 +58,7 @@ class nsThrobber : public nsIThrobber,
 public:
   nsThrobber(nsISupports* aOuter);
 
-  void* operator new(size_t sz) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = new char[sz];
-    nsCRT::zero(rv, sz);
-    return rv;
-  }
 
   // nsISupports
   NS_DECL_ISUPPORTS

webshell/src/nsWebShell.cpp

@@ -130,11 +130,7 @@ public:
   nsWebShell();
   virtual ~nsWebShell();
 
-  void* operator new(size_t sz) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = new char[sz];
-    nsCRT::zero(rv, sz);
-    return rv;
-  }
 
   // nsISupports
   NS_DECL_ISUPPORTS

webshell/tests/viewer/nsBrowserWindow.h

@@ -60,11 +60,7 @@ class nsBrowserWindow : public nsIBrowserWindow,
                         public nsIWebShellContainer
 {
 public:
-  void* operator new(size_t sz) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = new char[sz];
-    nsCRT::zero(rv, sz);
-    return rv;
-  }
 
   // nsISupports
   NS_DECL_ISUPPORTS

webshell/tests/viewer/nsViewerApp.h

@@ -33,11 +33,7 @@ class nsIBrowserWindow;
 class nsViewerApp : public nsISupports, public nsDispatchListener
 {
 public:
-  void* operator new(size_t sz) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = new char[sz];
-    nsCRT::zero(rv, sz);
-    return rv;
-  }
 
   virtual ~nsViewerApp();
 

webshell/tests/viewer/nsXPBaseWindow.h

@@ -48,11 +48,7 @@ class nsXPBaseWindow : public nsIXPBaseWindow,
                        public nsIDOMMouseListener
 {
 public:
-  void* operator new(size_t sz) {
+  NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
-    void* rv = new char[sz];
-    nsCRT::zero(rv, sz);
-    return rv;
-  }
 
   nsXPBaseWindow();
   virtual ~nsXPBaseWindow();