From 8334239104eeb88879a4e375d817dbb4bb7e93e3 Mon Sep 17 00:00:00 2001 From: "kipp%netscape.com" Date: Fri, 26 Feb 1999 20:02:06 +0000 Subject: [PATCH] fixed up operator new usage git-svn-id: svn://10.0.0.236/trunk@22208 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsStyleContext.cpp | 12 +---------- .../html/document/src/nsHTMLContentSink.cpp | 14 ++----------- .../html/style/src/nsCSSDeclaration.cpp | 20 +++---------------- .../content/html/style/src/nsCSSStruct.cpp | 20 +++---------------- mozilla/docshell/base/nsWebShell.cpp | 6 +----- .../htmlparser/tests/grabpage/grabpage.cpp | 6 +----- mozilla/layout/base/nsPresShell.cpp | 12 +---------- mozilla/layout/base/src/nsPresContext.h | 12 +---------- mozilla/layout/base/src/nsStyleContext.cpp | 12 +---------- mozilla/layout/generic/nsFrame.cpp | 14 +------------ mozilla/layout/generic/nsFrame.h | 4 +--- mozilla/layout/html/base/src/nsFrame.cpp | 14 +------------ mozilla/layout/html/base/src/nsFrame.h | 4 +--- mozilla/layout/html/base/src/nsPresShell.cpp | 12 +---------- .../html/document/src/nsHTMLContentSink.cpp | 14 ++----------- .../html/style/src/nsCSSDeclaration.cpp | 20 +++---------------- mozilla/layout/style/nsCSSDeclaration.cpp | 20 +++---------------- mozilla/layout/style/nsCSSStruct.cpp | 20 +++---------------- mozilla/layout/style/nsStyleContext.cpp | 12 +---------- .../htmlparser/tests/grabpage/grabpage.cpp | 6 +----- mozilla/webshell/src/nsDocumentViewer.cpp | 6 +----- mozilla/webshell/src/nsPluginViewer.cpp | 6 +----- mozilla/webshell/src/nsThrobber.cpp | 6 +----- mozilla/webshell/src/nsWebShell.cpp | 6 +----- .../webshell/tests/viewer/nsBrowserWindow.h | 6 +----- mozilla/webshell/tests/viewer/nsViewerApp.h | 6 +----- .../webshell/tests/viewer/nsXPBaseWindow.h | 6 +----- 27 files changed, 39 insertions(+), 257 deletions(-) diff --git a/mozilla/content/base/src/nsStyleContext.cpp b/mozilla/content/base/src/nsStyleContext.cpp index 4e03accc48f..11ae803aa6b 100644 --- a/mozilla/content/base/src/nsStyleContext.cpp +++ b/mozilla/content/base/src/nsStyleContext.cpp @@ -691,17 +691,7 @@ public: nsIPresContext* aPresContext); virtual ~StyleContextImpl(); - 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); - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW NS_DECL_ISUPPORTS diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index 80792e48a45..e3e530be1c2 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/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); diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp index 74a9b9ffadf..cc698689f5a 100644 --- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/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) -{ - void* result = ::operator new(size); - if (result) { - nsCRT::zero(result, size); - } - return result; -} - -void CSSDeclarationImpl::operator delete(void* ptr) -{ - ::operator delete(ptr); -} +NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl) CSSDeclarationImpl::CSSDeclarationImpl(void) { diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp index 74a9b9ffadf..cc698689f5a 100644 --- a/mozilla/content/html/style/src/nsCSSStruct.cpp +++ b/mozilla/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) -{ - void* result = ::operator new(size); - if (result) { - nsCRT::zero(result, size); - } - return result; -} - -void CSSDeclarationImpl::operator delete(void* ptr) -{ - ::operator delete(ptr); -} +NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl) CSSDeclarationImpl::CSSDeclarationImpl(void) { diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index dccdb29123d..a506101f272 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -130,11 +130,7 @@ public: nsWebShell(); virtual ~nsWebShell(); - void* operator new(size_t sz) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW // nsISupports NS_DECL_ISUPPORTS diff --git a/mozilla/htmlparser/tests/grabpage/grabpage.cpp b/mozilla/htmlparser/tests/grabpage/grabpage.cpp index e89b1b7feaa..a0fbc96d8c7 100644 --- a/mozilla/htmlparser/tests/grabpage/grabpage.cpp +++ b/mozilla/htmlparser/tests/grabpage/grabpage.cpp @@ -138,11 +138,7 @@ public: PageGrabber(); ~PageGrabber(); - void* operator new(size_t size) { - void* rv = ::operator new(size); - nsCRT::zero(rv, size); - return (void*) rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW nsresult Init(const nsString& aDirectory); diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index e74ceb6a3ed..d4f8424a5ea 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -190,17 +190,7 @@ class PresShell : public nsIPresShell, public nsIViewObserver, public: PresShell(); - void* operator new(size_t size) { - void* result = ::operator new(size); - if (result) { - nsCRT::zero(result, size); - } - return result; - } - - void operator delete(void* ptr) { - ::operator delete(ptr); - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW // nsISupports NS_DECL_ISUPPORTS diff --git a/mozilla/layout/base/src/nsPresContext.h b/mozilla/layout/base/src/nsPresContext.h index d5737c6c313..8761c34d0c3 100644 --- a/mozilla/layout/base/src/nsPresContext.h +++ b/mozilla/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) { - void* rv = ::operator new(size); - if (rv) { - nsCRT::zero(rv, size); - } - return rv; - } - - void operator delete(void* ptr) { - ::operator delete(ptr); - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW // nsISupports methods NS_DECL_ISUPPORTS diff --git a/mozilla/layout/base/src/nsStyleContext.cpp b/mozilla/layout/base/src/nsStyleContext.cpp index 4e03accc48f..11ae803aa6b 100644 --- a/mozilla/layout/base/src/nsStyleContext.cpp +++ b/mozilla/layout/base/src/nsStyleContext.cpp @@ -691,17 +691,7 @@ public: nsIPresContext* aPresContext); virtual ~StyleContextImpl(); - 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); - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW NS_DECL_ISUPPORTS diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 6063dbd92bc..a10db05114d 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -159,19 +159,7 @@ NS_NewEmptyFrame(nsIFrame** aInstancePtrResult) return NS_OK; } -void* nsFrame::operator new(size_t size) -{ - void* result = ::operator new(size); - if (result) { - nsCRT::zero(result, size); - } - return result; -} - -void nsFrame::operator delete(void* ptr) -{ - ::operator delete(ptr); -} +NS_IMPL_ZEROING_OPERATOR_NEW(nsFrame) nsFrame::nsFrame() { diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index 5b5494ca9b2..cbf6777093b 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/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); - - void operator delete(void* ptr); + NS_DECL_ZEROING_OPERATOR_NEW // nsISupports NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 6063dbd92bc..a10db05114d 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -159,19 +159,7 @@ NS_NewEmptyFrame(nsIFrame** aInstancePtrResult) return NS_OK; } -void* nsFrame::operator new(size_t size) -{ - void* result = ::operator new(size); - if (result) { - nsCRT::zero(result, size); - } - return result; -} - -void nsFrame::operator delete(void* ptr) -{ - ::operator delete(ptr); -} +NS_IMPL_ZEROING_OPERATOR_NEW(nsFrame) nsFrame::nsFrame() { diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index 5b5494ca9b2..cbf6777093b 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/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); - - void operator delete(void* ptr); + NS_DECL_ZEROING_OPERATOR_NEW // nsISupports NS_IMETHOD QueryInterface(const nsIID& aIID, void** aInstancePtr); diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index e74ceb6a3ed..d4f8424a5ea 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -190,17 +190,7 @@ class PresShell : public nsIPresShell, public nsIViewObserver, public: PresShell(); - void* operator new(size_t size) { - void* result = ::operator new(size); - if (result) { - nsCRT::zero(result, size); - } - return result; - } - - void operator delete(void* ptr) { - ::operator delete(ptr); - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW // nsISupports NS_DECL_ISUPPORTS diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index 80792e48a45..e3e530be1c2 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/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); diff --git a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp b/mozilla/layout/html/style/src/nsCSSDeclaration.cpp index 74a9b9ffadf..cc698689f5a 100644 --- a/mozilla/layout/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/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) -{ - void* result = ::operator new(size); - if (result) { - nsCRT::zero(result, size); - } - return result; -} - -void CSSDeclarationImpl::operator delete(void* ptr) -{ - ::operator delete(ptr); -} +NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl) CSSDeclarationImpl::CSSDeclarationImpl(void) { diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp index 74a9b9ffadf..cc698689f5a 100644 --- a/mozilla/layout/style/nsCSSDeclaration.cpp +++ b/mozilla/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) -{ - void* result = ::operator new(size); - if (result) { - nsCRT::zero(result, size); - } - return result; -} - -void CSSDeclarationImpl::operator delete(void* ptr) -{ - ::operator delete(ptr); -} +NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl) CSSDeclarationImpl::CSSDeclarationImpl(void) { diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp index 74a9b9ffadf..cc698689f5a 100644 --- a/mozilla/layout/style/nsCSSStruct.cpp +++ b/mozilla/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) -{ - void* result = ::operator new(size); - if (result) { - nsCRT::zero(result, size); - } - return result; -} - -void CSSDeclarationImpl::operator delete(void* ptr) -{ - ::operator delete(ptr); -} +NS_IMPL_ZEROING_OPERATOR_NEW(CSSDeclarationImpl) CSSDeclarationImpl::CSSDeclarationImpl(void) { diff --git a/mozilla/layout/style/nsStyleContext.cpp b/mozilla/layout/style/nsStyleContext.cpp index 4e03accc48f..11ae803aa6b 100644 --- a/mozilla/layout/style/nsStyleContext.cpp +++ b/mozilla/layout/style/nsStyleContext.cpp @@ -691,17 +691,7 @@ public: nsIPresContext* aPresContext); virtual ~StyleContextImpl(); - 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); - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW NS_DECL_ISUPPORTS diff --git a/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp b/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp index e89b1b7feaa..a0fbc96d8c7 100644 --- a/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp +++ b/mozilla/parser/htmlparser/tests/grabpage/grabpage.cpp @@ -138,11 +138,7 @@ public: PageGrabber(); ~PageGrabber(); - void* operator new(size_t size) { - void* rv = ::operator new(size); - nsCRT::zero(rv, size); - return (void*) rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW nsresult Init(const nsString& aDirectory); diff --git a/mozilla/webshell/src/nsDocumentViewer.cpp b/mozilla/webshell/src/nsDocumentViewer.cpp index 8f360be5f3d..475f2fc57f3 100644 --- a/mozilla/webshell/src/nsDocumentViewer.cpp +++ b/mozilla/webshell/src/nsDocumentViewer.cpp @@ -62,11 +62,7 @@ public: DocumentViewerImpl(); DocumentViewerImpl(nsIPresContext* aPresContext); - void* operator new(size_t sz) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW // nsISupports interface... NS_DECL_ISUPPORTS diff --git a/mozilla/webshell/src/nsPluginViewer.cpp b/mozilla/webshell/src/nsPluginViewer.cpp index 200c75caab1..dfe506b82d3 100644 --- a/mozilla/webshell/src/nsPluginViewer.cpp +++ b/mozilla/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) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW // nsISupports NS_DECL_ISUPPORTS diff --git a/mozilla/webshell/src/nsThrobber.cpp b/mozilla/webshell/src/nsThrobber.cpp index b99a751277e..a61ef01d627 100644 --- a/mozilla/webshell/src/nsThrobber.cpp +++ b/mozilla/webshell/src/nsThrobber.cpp @@ -58,11 +58,7 @@ class nsThrobber : public nsIThrobber, public: nsThrobber(nsISupports* aOuter); - void* operator new(size_t sz) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW // nsISupports NS_DECL_ISUPPORTS diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index dccdb29123d..a506101f272 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -130,11 +130,7 @@ public: nsWebShell(); virtual ~nsWebShell(); - void* operator new(size_t sz) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW // nsISupports NS_DECL_ISUPPORTS diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.h b/mozilla/webshell/tests/viewer/nsBrowserWindow.h index 1fecf49c855..e07a31d2b2e 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.h +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.h @@ -60,11 +60,7 @@ class nsBrowserWindow : public nsIBrowserWindow, public nsIWebShellContainer { public: - void* operator new(size_t sz) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW // nsISupports NS_DECL_ISUPPORTS diff --git a/mozilla/webshell/tests/viewer/nsViewerApp.h b/mozilla/webshell/tests/viewer/nsViewerApp.h index cc18b56ea33..5060064373d 100644 --- a/mozilla/webshell/tests/viewer/nsViewerApp.h +++ b/mozilla/webshell/tests/viewer/nsViewerApp.h @@ -33,11 +33,7 @@ class nsIBrowserWindow; class nsViewerApp : public nsISupports, public nsDispatchListener { public: - void* operator new(size_t sz) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW virtual ~nsViewerApp(); diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.h b/mozilla/webshell/tests/viewer/nsXPBaseWindow.h index a14a4278d71..319d27eb148 100644 --- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.h +++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.h @@ -48,11 +48,7 @@ class nsXPBaseWindow : public nsIXPBaseWindow, public nsIDOMMouseListener { public: - void* operator new(size_t sz) { - void* rv = new char[sz]; - nsCRT::zero(rv, sz); - return rv; - } + NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW nsXPBaseWindow(); virtual ~nsXPBaseWindow();