Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-05-13 17:07:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset db6f8068e9a5

Browse Source
This commit is contained in:
Dão Gottwald 2010-06-29 17:49:21 +02:00
parent c81affe35c
commit 0978149cf3
49 changed files with 117 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessible/src/base/nsAccessNode.cpp
View File

@ -131,7 +131,7 @@ void nsAccessNode::LastRelease()
NS_ASSERTION(!mWeakShell, "A Shutdown() impl forgot to call its parent's Shutdown?"); NS_ASSERTION(!mWeakShell, "A Shutdown() impl forgot to call its parent's Shutdown?");
} }
// ... then die. // ... then die.
delete this; NS_DELETEXPCOM(this);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

2
caps/src/nsNullPrincipal.cpp
View File

@ -76,7 +76,7 @@ nsNullPrincipal::Release()
nsrefcnt count = PR_AtomicDecrement((PRInt32 *)&mJSPrincipals.refcount); nsrefcnt count = PR_AtomicDecrement((PRInt32 *)&mJSPrincipals.refcount);
NS_LOG_RELEASE(this, count, "nsNullPrincipal"); NS_LOG_RELEASE(this, count, "nsNullPrincipal");
if (count == 0) { if (count == 0) {
delete this; NS_DELETEXPCOM(this);
} }
return count; return count;

2
caps/src/nsPrincipal.cpp
View File

@ -164,7 +164,7 @@ nsPrincipal::Release()
nsrefcnt count = PR_AtomicDecrement((PRInt32 *)&mJSPrincipals.refcount); nsrefcnt count = PR_AtomicDecrement((PRInt32 *)&mJSPrincipals.refcount);
NS_LOG_RELEASE(this, count, "nsPrincipal"); NS_LOG_RELEASE(this, count, "nsPrincipal");
if (count == 0) { if (count == 0) {
delete this; NS_DELETEXPCOM(this);
} }
return count; return count;

2
caps/src/nsSystemPrincipal.cpp
View File

@ -73,7 +73,7 @@ nsSystemPrincipal::Release()
nsrefcnt count = PR_AtomicDecrement((PRInt32 *)&mJSPrincipals.refcount); nsrefcnt count = PR_AtomicDecrement((PRInt32 *)&mJSPrincipals.refcount);
NS_LOG_RELEASE(this, count, "nsSystemPrincipal"); NS_LOG_RELEASE(this, count, "nsSystemPrincipal");
if (count == 0) { if (count == 0) {
delete this; NS_DELETEXPCOM(this);
} }
return count; return count;

3
content/base/src/nsXMLHttpRequest.cpp
View File

@ -1360,7 +1360,8 @@ nsXMLHttpRequest::GetAllResponseHeaders(char **_retval)
nsCOMPtr<nsIHttpChannel> httpChannel = GetCurrentHttpChannel(); nsCOMPtr<nsIHttpChannel> httpChannel = GetCurrentHttpChannel();
if (httpChannel) { if (httpChannel) {
nsHeaderVisitor *visitor = new nsHeaderVisitor(); nsHeaderVisitor *visitor = nsnull;
NS_NEWXPCOM(visitor, nsHeaderVisitor);
if (!visitor) if (!visitor)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(visitor); NS_ADDREF(visitor);

3
content/xbl/src/nsXBLContentSink.cpp
View File

@ -71,7 +71,8 @@ NS_NewXBLContentSink(nsIXMLContentSink** aResult,
{ {
NS_ENSURE_ARG_POINTER(aResult); NS_ENSURE_ARG_POINTER(aResult);
nsXBLContentSink* it = new nsXBLContentSink(); nsXBLContentSink* it;
NS_NEWXPCOM(it, nsXBLContentSink);
NS_ENSURE_TRUE(it, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(it, NS_ERROR_OUT_OF_MEMORY);
nsCOMPtr<nsIXMLContentSink> kungFuDeathGrip = it; nsCOMPtr<nsIXMLContentSink> kungFuDeathGrip = it;

3
content/xml/document/src/nsXMLContentSink.cpp
View File

@ -124,7 +124,8 @@ NS_NewXMLContentSink(nsIXMLContentSink** aResult,
if (nsnull == aResult) { if (nsnull == aResult) {
return NS_ERROR_NULL_POINTER; return NS_ERROR_NULL_POINTER;
} }
nsXMLContentSink* it = new nsXMLContentSink(); nsXMLContentSink* it;
NS_NEWXPCOM(it, nsXMLContentSink);
if (nsnull == it) { if (nsnull == it) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
} }

6
dom/base/nsGlobalWindowCommands.cpp
View File

@ -909,7 +909,8 @@ nsClipboardDragDropHookCommand::GetCommandStateParams(const char *aCommandName,
#define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName) \ #define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName) \
{ \ { \
_cmdClass* theCmd = new _cmdClass(); \ _cmdClass* theCmd; \
NS_NEWXPCOM(theCmd, _cmdClass); \
if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \
rv = inCommandTable->RegisterCommand(_cmdName, \ rv = inCommandTable->RegisterCommand(_cmdName, \
static_cast<nsIControllerCommand *>(theCmd)); \ static_cast<nsIControllerCommand *>(theCmd)); \
@ -917,7 +918,8 @@ nsClipboardDragDropHookCommand::GetCommandStateParams(const char *aCommandName,
#define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \ #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \
{ \ { \
_cmdClass* theCmd = new _cmdClass(); \ _cmdClass* theCmd; \
NS_NEWXPCOM(theCmd, _cmdClass); \
if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \ if (!theCmd) return NS_ERROR_OUT_OF_MEMORY; \
rv = inCommandTable->RegisterCommand(_cmdName, \ rv = inCommandTable->RegisterCommand(_cmdName, \
static_cast<nsIControllerCommand *>(theCmd)); static_cast<nsIControllerCommand *>(theCmd));

6
editor/composer/src/nsComposerController.cpp
View File

@ -44,7 +44,8 @@
#define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName) \ #define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName) \
{ \ { \
_cmdClass* theCmd = new _cmdClass(); \ _cmdClass* theCmd; \
NS_NEWXPCOM(theCmd, _cmdClass); \
NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \ NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \
rv = inCommandTable->RegisterCommand(_cmdName, \ rv = inCommandTable->RegisterCommand(_cmdName, \
static_cast<nsIControllerCommand *>(theCmd)); \ static_cast<nsIControllerCommand *>(theCmd)); \
@ -52,7 +53,8 @@
#define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \ #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \
{ \ { \
_cmdClass* theCmd = new _cmdClass(); \ _cmdClass* theCmd; \
NS_NEWXPCOM(theCmd, _cmdClass); \
NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \ NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \
rv = inCommandTable->RegisterCommand(_cmdName, \ rv = inCommandTable->RegisterCommand(_cmdName, \
static_cast<nsIControllerCommand *>(theCmd)); static_cast<nsIControllerCommand *>(theCmd));

3
editor/composer/src/nsComposerRegistration.cpp
View File

@ -84,7 +84,8 @@ nsComposeTxtSrvFilterConstructor(nsISupports *aOuter, REFNSIID aIID,
{ {
return NS_ERROR_NO_AGGREGATION; return NS_ERROR_NO_AGGREGATION;
} }
nsComposeTxtSrvFilter * inst = new nsComposeTxtSrvFilter(); nsComposeTxtSrvFilter * inst;
NS_NEWXPCOM(inst, nsComposeTxtSrvFilter);
if (NULL == inst) if (NULL == inst)
{ {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;

6
editor/libeditor/base/nsEditorController.cpp
View File

@ -47,7 +47,8 @@
#define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName) \ #define NS_REGISTER_ONE_COMMAND(_cmdClass, _cmdName) \
{ \ { \
_cmdClass* theCmd = new _cmdClass(); \ _cmdClass* theCmd; \
NS_NEWXPCOM(theCmd, _cmdClass); \
NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \ NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \
rv = inCommandTable->RegisterCommand(_cmdName, \ rv = inCommandTable->RegisterCommand(_cmdName, \
static_cast<nsIControllerCommand *>(theCmd)); \ static_cast<nsIControllerCommand *>(theCmd)); \
@ -55,7 +56,8 @@
#define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \ #define NS_REGISTER_FIRST_COMMAND(_cmdClass, _cmdName) \
{ \ { \
_cmdClass* theCmd = new _cmdClass(); \ _cmdClass* theCmd; \
NS_NEWXPCOM(theCmd, _cmdClass); \
NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \ NS_ENSURE_TRUE(theCmd, NS_ERROR_OUT_OF_MEMORY); \
rv = inCommandTable->RegisterCommand(_cmdName, \ rv = inCommandTable->RegisterCommand(_cmdName, \
static_cast<nsIControllerCommand *>(theCmd)); static_cast<nsIControllerCommand *>(theCmd));

2
editor/libeditor/html/nsEditorTxnLog.cpp
View File

@ -70,7 +70,7 @@ nsrefcnt nsEditorTxnLog::Release(void)
{ {
NS_PRECONDITION(0 != mRefCnt, "dup release"); NS_PRECONDITION(0 != mRefCnt, "dup release");
if (--mRefCnt == 0) { if (--mRefCnt == 0) {
delete this; NS_DELETEXPCOM(this);
return 0; return 0;
} }
return mRefCnt; return mRefCnt;

15
embedding/browser/webBrowser/nsWebBrowser.cpp
View File

@ -153,7 +153,7 @@ NS_IMETHODIMP nsWebBrowser::InternalDestroy()
if (mListenerArray) { if (mListenerArray) {
for (PRUint32 i = 0, end = mListenerArray->Length(); i < end; i++) { for (PRUint32 i = 0, end = mListenerArray->Length(); i < end; i++) {
nsWebBrowserListenerState *state = mListenerArray->ElementAt(i); nsWebBrowserListenerState *state = mListenerArray->ElementAt(i);
delete state; NS_DELETEXPCOM(state);
} }
delete mListenerArray; delete mListenerArray;
mListenerArray = nsnull; mListenerArray = nsnull;
@ -236,14 +236,15 @@ NS_IMETHODIMP nsWebBrowser::AddWebBrowserListener(nsIWeakReference *aListener, c
if (!mWebProgress) { if (!mWebProgress) {
// The window hasn't been created yet, so queue up the listener. They'll be // The window hasn't been created yet, so queue up the listener. They'll be
// registered when the window gets created. // registered when the window gets created.
nsAutoPtr<nsWebBrowserListenerState> state = new nsWebBrowserListenerState(); nsAutoPtr<nsWebBrowserListenerState> state;
NS_NEWXPCOM(state, nsWebBrowserListenerState);
if (!state) return NS_ERROR_OUT_OF_MEMORY; if (!state) return NS_ERROR_OUT_OF_MEMORY;
state->mWeakPtr = aListener; state->mWeakPtr = aListener;
state->mID = aIID; state->mID = aIID;
if (!mListenerArray) { if (!mListenerArray) {
mListenerArray = new nsTArray<nsWebBrowserListenerState*>(); NS_NEWXPCOM(mListenerArray, nsTArray<nsWebBrowserListenerState*>);
if (!mListenerArray) { if (!mListenerArray) {
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
} }
@ -314,9 +315,9 @@ NS_IMETHODIMP nsWebBrowser::RemoveWebBrowserListener(nsIWeakReference *aListener
if (0 >= mListenerArray->Length()) { if (0 >= mListenerArray->Length()) {
for (PRUint32 i = 0, end = mListenerArray->Length(); i < end; i++) { for (PRUint32 i = 0, end = mListenerArray->Length(); i < end; i++) {
nsWebBrowserListenerState *state = mListenerArray->ElementAt(i); nsWebBrowserListenerState *state = mListenerArray->ElementAt(i);
delete state; NS_DELETEXPCOM(state);
} }
delete mListenerArray; NS_DELETEXPCOM(mListenerArray);
mListenerArray = nsnull; mListenerArray = nsnull;
} }
@ -1171,9 +1172,9 @@ NS_IMETHODIMP nsWebBrowser::Create()
} }
for (PRUint32 i = 0, end = mListenerArray->Length(); i < end; i++) { for (PRUint32 i = 0, end = mListenerArray->Length(); i < end; i++) {
nsWebBrowserListenerState *state = mListenerArray->ElementAt(i); nsWebBrowserListenerState *state = mListenerArray->ElementAt(i);
delete state; NS_DELETEXPCOM(state);
} }
delete mListenerArray; NS_DELETEXPCOM(mListenerArray);
mListenerArray = nsnull; mListenerArray = nsnull;
} }

2
embedding/components/printingui/src/win/nsPrintProgress.cpp
View File

@ -69,7 +69,7 @@ NS_IMETHODIMP_(nsrefcnt) nsPrintProgress::Release(void)
mRefCnt = 1; /* stabilize */ mRefCnt = 1; /* stabilize */
/* enable this to find non-threadsafe destructors: */ /* enable this to find non-threadsafe destructors: */
/* NS_ASSERT_OWNINGTHREAD(nsPrintProgress); */ /* NS_ASSERT_OWNINGTHREAD(nsPrintProgress); */
delete this; NS_DELETEXPCOM(this);
return 0; return 0;
} }
return count; return count;

4
extensions/spellcheck/src/mozSpellCheckerFactory.cpp
View File

@ -92,13 +92,15 @@ mozInlineSpellCheckerConstructor(nsISupports *aOuter, REFNSIID aIID,
nsresult rv; nsresult rv;
mozInlineSpellChecker* inst;
*aResult = NULL; *aResult = NULL;
if (NULL != aOuter) { if (NULL != aOuter) {
rv = NS_ERROR_NO_AGGREGATION; rv = NS_ERROR_NO_AGGREGATION;
return rv; return rv;
} }
mozInlineSpellChecker* inst = new mozInlineSpellChecker(); NS_NEWXPCOM(inst, mozInlineSpellChecker);
if (NULL == inst) { if (NULL == inst) {
rv = NS_ERROR_OUT_OF_MEMORY; rv = NS_ERROR_OUT_OF_MEMORY;
return rv; return rv;

3
gfx/src/thebes/nsThebesGfxFactory.cpp
View File

@ -74,7 +74,8 @@ static NS_IMETHODIMP nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID
return rv; return rv;
} }
nsCOMPtr <nsIRegion> rgn = new nsThebesRegion(); nsCOMPtr <nsIRegion> rgn;
NS_NEWXPCOM(rgn, nsThebesRegion);
nsCOMPtr<nsIScriptableRegion> scriptableRgn; nsCOMPtr<nsIScriptableRegion> scriptableRgn;
if (rgn != nsnull) if (rgn != nsnull)
{ {

2
gfx/thebes/gfxTypes.h
View File

@ -104,7 +104,7 @@ public: \
NS_LOG_RELEASE(this, count, #_class); \ NS_LOG_RELEASE(this, count, #_class); \
if (count == 0) { \ if (count == 0) { \
mRefCnt = 1; /* stabilize */ \ mRefCnt = 1; /* stabilize */ \
delete this; \ NS_DELETEXPCOM(this); \
return 0; \ return 0; \
} \ } \
return count; \ return count; \

2
intl/unicharutil/src/nsCaseConversionImp2.cpp
View File

@ -164,7 +164,7 @@ static nsCompressedMap gLowerMap = {
nsCaseConversionImp2* nsCaseConversionImp2::GetInstance() nsCaseConversionImp2* nsCaseConversionImp2::GetInstance()
{ {
if (!gCaseConv) if (!gCaseConv)
gCaseConv = new nsCaseConversionImp2(); NS_NEWXPCOM(gCaseConv, nsCaseConversionImp2);
return gCaseConv; return gCaseConv;
} }

2
js/src/xpconnect/src/xpcwrappedjs.cpp
View File

@ -237,7 +237,7 @@ do_decrement:
if(0 == cnt) if(0 == cnt)
{ {
delete this; // also unlinks us from chain NS_DELETEXPCOM(this); // also unlinks us from chain
return 0; return 0;
} }
if(1 == cnt) if(1 == cnt)

2
js/src/xpconnect/tests/components/xpctest_noisy.cpp
View File

@ -77,7 +77,7 @@ NS_IMETHODIMP_(nsrefcnt) xpctestNoisy::Release(void)
printf("Noisy %d - decremented refcount to %d\n", mID, mRefCnt.get()); printf("Noisy %d - decremented refcount to %d\n", mID, mRefCnt.get());
NS_LOG_RELEASE(this, mRefCnt, "xpctestNoisy"); NS_LOG_RELEASE(this, mRefCnt, "xpctestNoisy");
if (mRefCnt == 0) { if (mRefCnt == 0) {
delete this; NS_DELETEXPCOM(this);
return 0; return 0;
} }
return mRefCnt; return mRefCnt;

3
layout/base/nsDocumentViewer.cpp
View File

@ -789,7 +789,8 @@ DocumentViewerImpl::InitPresentationStuff(PRBool aDoInitialReflow)
// //
// now register ourselves as a focus listener, so that we get called // now register ourselves as a focus listener, so that we get called
// when the focus changes in the window // when the focus changes in the window
nsDocViewerFocusListener *focusListener = new nsDocViewerFocusListener(); nsDocViewerFocusListener *focusListener;
NS_NEWXPCOM(focusListener, nsDocViewerFocusListener);
NS_ENSURE_TRUE(focusListener, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(focusListener, NS_ERROR_OUT_OF_MEMORY);
focusListener->Init(this); focusListener->Init(this);

4
layout/build/nsLayoutModule.cpp
View File

@ -583,13 +583,15 @@ _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
{ \ { \
nsresult rv; \ nsresult rv; \
\ \
_InstanceClass * inst; \
\
*aResult = NULL; \ *aResult = NULL; \
if (NULL != aOuter) { \ if (NULL != aOuter) { \
rv = NS_ERROR_NO_AGGREGATION; \ rv = NS_ERROR_NO_AGGREGATION; \
return rv; \ return rv; \
} \ } \
\ \
_InstanceClass * inst = new _InstanceClass(); \ NS_NEWXPCOM(inst, _InstanceClass); \
if (NULL == inst) { \ if (NULL == inst) { \
rv = NS_ERROR_OUT_OF_MEMORY; \ rv = NS_ERROR_OUT_OF_MEMORY; \
return rv; \ return rv; \

3
layout/generic/nsBulletFrame.cpp
View File

@ -142,7 +142,8 @@ nsBulletFrame::DidSetStyleContext(nsStyleContext* aOldStyleContext)
if (newRequest) { if (newRequest) {
if (!mListener) { if (!mListener) {
nsBulletListener *listener = new nsBulletListener(); nsBulletListener *listener;
NS_NEWXPCOM(listener, nsBulletListener);
NS_ADDREF(listener); NS_ADDREF(listener);
listener->SetFrame(this); listener->SetFrame(this);
listener->QueryInterface(NS_GET_IID(imgIDecoderObserver), getter_AddRefs(mListener)); listener->QueryInterface(NS_GET_IID(imgIDecoderObserver), getter_AddRefs(mListener));

3
layout/xul/base/src/nsImageBoxFrame.cpp
View File

@ -222,7 +222,8 @@ nsImageBoxFrame::Init(nsIContent* aContent,
nsIFrame* aPrevInFlow) nsIFrame* aPrevInFlow)
{ {
if (!mListener) { if (!mListener) {
nsImageBoxListener *listener = new nsImageBoxListener(); nsImageBoxListener *listener;
NS_NEWXPCOM(listener, nsImageBoxListener);
NS_ADDREF(listener); NS_ADDREF(listener);
listener->SetFrame(this); listener->SetFrame(this);
listener->QueryInterface(NS_GET_IID(imgIDecoderObserver), getter_AddRefs(mListener)); listener->QueryInterface(NS_GET_IID(imgIDecoderObserver), getter_AddRefs(mListener));

2
modules/libjar/nsJAR.cpp
View File

@ -145,7 +145,7 @@ nsrefcnt nsJAR::Release(void)
mRefCnt = 1; /* stabilize */ mRefCnt = 1; /* stabilize */
/* enable this to find non-threadsafe destructors: */ /* enable this to find non-threadsafe destructors: */
/* NS_ASSERT_OWNINGTHREAD(nsJAR); */ /* NS_ASSERT_OWNINGTHREAD(nsJAR); */
delete this; NS_DELETEXPCOM(this);
return 0; return 0;
} }
else if (1 == count && mCache) { else if (1 == count && mCache) {

3
modules/libpr0n/decoders/icon/nsIconProtocolHandler.cpp
View File

@ -94,7 +94,8 @@ NS_IMETHODIMP nsIconProtocolHandler::NewURI(const nsACString &aSpec,
nsIURI **result) nsIURI **result)
{ {
nsCOMPtr<nsIURI> uri = new nsMozIconURI(); nsCOMPtr<nsIURI> uri;
NS_NEWXPCOM(uri, nsMozIconURI);
if (!uri) return NS_ERROR_OUT_OF_MEMORY; if (!uri) return NS_ERROR_OUT_OF_MEMORY;
nsresult rv = uri->SetSpec(aSpec); nsresult rv = uri->SetSpec(aSpec);

2
modules/libpr0n/src/imgLoader.cpp
View File

@ -661,7 +661,7 @@ nsresult imgLoader::CreateNewProxyForRequest(imgRequest *aRequest, nsILoadGroup
if (aProxyRequest) { if (aProxyRequest) {
proxyRequest = static_cast<imgRequestProxy *>(aProxyRequest); proxyRequest = static_cast<imgRequestProxy *>(aProxyRequest);
} else { } else {
proxyRequest = new imgRequestProxy(); NS_NEWXPCOM(proxyRequest, imgRequestProxy);
if (!proxyRequest) return NS_ERROR_OUT_OF_MEMORY; if (!proxyRequest) return NS_ERROR_OUT_OF_MEMORY;
} }
NS_ADDREF(proxyRequest); NS_ADDREF(proxyRequest);

2
modules/libpr0n/src/imgTools.cpp
View File

@ -80,7 +80,7 @@ NS_IMETHODIMP imgTools::DecodeImageData(nsIInputStream* aInStr,
NS_ENSURE_ARG_POINTER(aInStr); NS_ENSURE_ARG_POINTER(aInStr);
// If the caller didn't provide a container, create one // If the caller didn't provide a container, create one
if (!*aContainer) { if (!*aContainer) {
*aContainer = new imgContainer(); NS_NEWXPCOM(*aContainer, imgContainer);
if (!*aContainer) if (!*aContainer)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(*aContainer); NS_ADDREF(*aContainer);

3
netwerk/base/src/nsMIMEInputStream.cpp
View File

@ -288,7 +288,8 @@ nsMIMEInputStreamConstructor(nsISupports *outer, REFNSIID iid, void **result)
if (outer) if (outer)
return NS_ERROR_NO_AGGREGATION; return NS_ERROR_NO_AGGREGATION;
nsMIMEInputStream *inst = new nsMIMEInputStream(); nsMIMEInputStream *inst;
NS_NEWXPCOM(inst, nsMIMEInputStream);
if (!inst) if (!inst)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;

3
netwerk/base/src/nsStandardURL.cpp
View File

@ -1651,7 +1651,8 @@ nsStandardURL::SchemeIs(const char *scheme, PRBool *result)
/* virtual */ nsStandardURL* /* virtual */ nsStandardURL*
nsStandardURL::StartClone() nsStandardURL::StartClone()
{ {
nsStandardURL *clone = new nsStandardURL(); nsStandardURL *clone;
NS_NEWXPCOM(clone, nsStandardURL);
return clone; return clone;
} }

4
netwerk/protocol/http/nsHttpHandler.cpp
View File

@ -1540,6 +1540,8 @@ nsHttpHandler::NewProxiedChannel(nsIURI *uri,
nsIProxyInfo* givenProxyInfo, nsIProxyInfo* givenProxyInfo,
nsIChannel **result) nsIChannel **result)
{ {
nsHttpChannel *httpChannel = nsnull;
LOG(("nsHttpHandler::NewProxiedChannel [proxyInfo=%p]\n", LOG(("nsHttpHandler::NewProxiedChannel [proxyInfo=%p]\n",
givenProxyInfo)); givenProxyInfo));
@ -1554,7 +1556,7 @@ nsHttpHandler::NewProxiedChannel(nsIURI *uri,
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
nsHttpChannel *httpChannel = new nsHttpChannel(); NS_NEWXPCOM(httpChannel, nsHttpChannel);
if (!httpChannel) if (!httpChannel)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(httpChannel); NS_ADDREF(httpChannel);

6
netwerk/protocol/res/nsResProtocolHandler.cpp
View File

@ -129,7 +129,8 @@ nsResURL::EnsureFile()
/* virtual */ nsStandardURL* /* virtual */ nsStandardURL*
nsResURL::StartClone() nsResURL::StartClone()
{ {
nsResURL *clone = new nsResURL(); nsResURL *clone;
NS_NEWXPCOM(clone, nsResURL);
return clone; return clone;
} }
@ -303,7 +304,8 @@ nsResProtocolHandler::NewURI(const nsACString &aSpec,
{ {
nsresult rv; nsresult rv;
nsResURL *resURL = new nsResURL(); nsResURL *resURL;
NS_NEWXPCOM(resURL, nsResURL);
if (!resURL) if (!resURL)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(resURL); NS_ADDREF(resURL);

4
security/manager/ssl/src/nsNSSModule.cpp
View File

@ -107,7 +107,7 @@ _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
return NS_ERROR_FAILURE; \ return NS_ERROR_FAILURE; \
} \ } \
\ \
inst = new _InstanceClass(); \ NS_NEWXPCOM(inst, _InstanceClass); \
if (NULL == inst) { \ if (NULL == inst) { \
if (triggeredByNSSComponent) \ if (triggeredByNSSComponent) \
EnsureNSSInitialized(nssInitFailed); \ EnsureNSSInitialized(nssInitFailed); \
@ -156,7 +156,7 @@ _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
return NS_ERROR_FAILURE; \ return NS_ERROR_FAILURE; \
} \ } \
\ \
inst = new _InstanceClass(); \ NS_NEWXPCOM(inst, _InstanceClass); \
if (NULL == inst) { \ if (NULL == inst) { \
if (triggeredByNSSComponent) \ if (triggeredByNSSComponent) \
EnsureNSSInitialized(nssInitFailed); \ EnsureNSSInitialized(nssInitFailed); \

3
uriloader/exthandler/nsExternalProtocolHandler.cpp
View File

@ -401,7 +401,8 @@ NS_IMETHODIMP nsExternalProtocolHandler::NewChannel(nsIURI *aURI, nsIChannel **_
PRBool haveExternalHandler = HaveExternalProtocolHandler(aURI); PRBool haveExternalHandler = HaveExternalProtocolHandler(aURI);
if (haveExternalHandler) if (haveExternalHandler)
{ {
nsCOMPtr<nsIChannel> channel = new nsExtProtocolChannel(); nsCOMPtr<nsIChannel> channel;
NS_NEWXPCOM(channel, nsExtProtocolChannel);
if (!channel) return NS_ERROR_OUT_OF_MEMORY; if (!channel) return NS_ERROR_OUT_OF_MEMORY;
((nsExtProtocolChannel*) channel.get())->SetURI(aURI); ((nsExtProtocolChannel*) channel.get())->SetURI(aURI);

2
widget/src/gtk2/nsGtkIMModule.h
View File

@ -73,7 +73,7 @@ public:
NS_LOG_RELEASE(this, mRefCnt, "nsGtkIMModule"); NS_LOG_RELEASE(this, mRefCnt, "nsGtkIMModule");
if (mRefCnt == 0) { if (mRefCnt == 0) {
mRefCnt = 1; /* stabilize */ mRefCnt = 1; /* stabilize */
delete this; NS_DELETEXPCOM(this);
return 0; return 0;
} }
return mRefCnt; return mRefCnt;

4
widget/src/gtk2/nsWidgetFactory.cpp
View File

@ -123,7 +123,7 @@ nsNativeThemeGTKConstructor(nsISupports *aOuter, REFNSIID aIID,
return rv; return rv;
} }
inst = new nsNativeThemeGTK(); NS_NEWXPCOM(inst, nsNativeThemeGTK);
if (NULL == inst) { if (NULL == inst) {
rv = NS_ERROR_OUT_OF_MEMORY; rv = NS_ERROR_OUT_OF_MEMORY;
return rv; return rv;
@ -197,7 +197,7 @@ nsNativeKeyBindingsConstructor(nsISupports *aOuter, REFNSIID aIID,
return rv; return rv;
} }
inst = new nsNativeKeyBindings(); NS_NEWXPCOM(inst, nsNativeKeyBindings);
if (NULL == inst) { if (NULL == inst) {
rv = NS_ERROR_OUT_OF_MEMORY; rv = NS_ERROR_OUT_OF_MEMORY;
return rv; return rv;

2
widget/src/os2/nsRwsService.cpp
View File

@ -1217,7 +1217,7 @@ static nsresult nsRwsServiceInit(nsRwsService **aClass)
} }
// create an instance of nsRwsService // create an instance of nsRwsService
sRwsInstance = new nsRwsService(); NS_NEWXPCOM(sRwsInstance, nsRwsService);
if (sRwsInstance == 0) if (sRwsInstance == 0)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;

2
widget/src/qt/nsWidgetFactory.cpp
View File

@ -95,7 +95,7 @@ nsNativeThemeQtConstructor(nsISupports *aOuter, REFNSIID aIID,
if (NULL != aOuter) if (NULL != aOuter)
return NS_ERROR_NO_AGGREGATION; return NS_ERROR_NO_AGGREGATION;
inst = new nsNativeThemeQt(); NS_NEWXPCOM(inst, nsNativeThemeQt);
if (NULL == inst) if (NULL == inst)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;

4
xpcom/base/nsAgg.h
View File

@ -155,7 +155,7 @@ _class::Internal::Release(void) \
NS_LOG_RELEASE(this, agg->mRefCnt, #_class); \ NS_LOG_RELEASE(this, agg->mRefCnt, #_class); \
if (agg->mRefCnt == 0) { \ if (agg->mRefCnt == 0) { \
agg->mRefCnt = 1; /* stabilize */ \ agg->mRefCnt = 1; /* stabilize */ \
delete agg; \ NS_DELETEXPCOM(agg); \
return 0; \ return 0; \
} \ } \
return agg->mRefCnt; \ return agg->mRefCnt; \
@ -188,7 +188,7 @@ _class::Internal::Release(void) \
NS_LOG_RELEASE(this, count, #_class); \ NS_LOG_RELEASE(this, count, #_class); \
if (count == 0) { \ if (count == 0) { \
agg->mRefCnt.stabilizeForDeletion(this); \ agg->mRefCnt.stabilizeForDeletion(this); \
delete agg; \ NS_DELETEXPCOM(agg); \
return 0; \ return 0; \
} \ } \
return count; \ return count; \

4
xpcom/base/nsTraceRefcntImpl.cpp
View File

@ -984,7 +984,7 @@ NS_LogAddRef(void* aPtr, nsrefcnt aRefcnt,
} }
} }
// Here's the case where MOZ_COUNT_CTOR was not used, // Here's the case where neither NS_NEWXPCOM nor MOZ_COUNT_CTOR were used,
// yet we still want to see creation information: // yet we still want to see creation information:
PRBool loggingThisType = (!gTypesToLog || LogThisType(aClazz)); PRBool loggingThisType = (!gTypesToLog || LogThisType(aClazz));
@ -1068,7 +1068,7 @@ NS_LogRelease(void* aPtr, nsrefcnt aRefcnt, const char* aClazz)
} }
} }
// Here's the case where MOZ_COUNT_DTOR was not used, // Here's the case where neither NS_DELETEXPCOM nor MOZ_COUNT_DTOR were used,
// yet we still want to see deletion information: // yet we still want to see deletion information:
if (aRefcnt == 0 && gAllocLog && loggingThisType && loggingThisObject) { if (aRefcnt == 0 && gAllocLog && loggingThisType && loggingThisObject) {

4
xpcom/glue/nsIGenericFactory.h
View File

@ -379,7 +379,7 @@ _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
return rv; \ return rv; \
} \ } \
\ \
inst = new _InstanceClass(); \ NS_NEWXPCOM(inst, _InstanceClass); \
if (NULL == inst) { \ if (NULL == inst) { \
rv = NS_ERROR_OUT_OF_MEMORY; \ rv = NS_ERROR_OUT_OF_MEMORY; \
return rv; \ return rv; \
@ -407,7 +407,7 @@ _InstanceClass##Constructor(nsISupports *aOuter, REFNSIID aIID, \
return rv; \ return rv; \
} \ } \
\ \
inst = new _InstanceClass(); \ NS_NEWXPCOM(inst, _InstanceClass); \
if (NULL == inst) { \ if (NULL == inst) { \
rv = NS_ERROR_OUT_OF_MEMORY; \ rv = NS_ERROR_OUT_OF_MEMORY; \
return rv; \ return rv; \

10
xpcom/glue/nsISupportsImpl.h
View File

@ -327,7 +327,7 @@ public: \
NS_LOG_RELEASE(this, mRefCnt, #_class); \ NS_LOG_RELEASE(this, mRefCnt, #_class); \
if (mRefCnt == 0) { \ if (mRefCnt == 0) { \
mRefCnt = 1; /* stabilize */ \ mRefCnt = 1; /* stabilize */ \
delete this; \ NS_DELETEXPCOM(this); \
} \ } \
} \ } \
protected: \ protected: \
@ -411,7 +411,7 @@ NS_IMETHODIMP_(nsrefcnt) _class::Release(void) \
* the refcount to |0|. * the refcount to |0|.
*/ */
#define NS_IMPL_RELEASE(_class) \ #define NS_IMPL_RELEASE(_class) \
NS_IMPL_RELEASE_WITH_DESTROY(_class, delete (this)) NS_IMPL_RELEASE_WITH_DESTROY(_class, NS_DELETEXPCOM(this))
/** /**
* Use this macro to implement the Release method for a given <i>_class</i> * Use this macro to implement the Release method for a given <i>_class</i>
@ -465,10 +465,10 @@ NS_IMETHODIMP_(nsrefcnt) _class::Release(void) \
NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _basetype, _destroy) NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _basetype, _destroy)
#define NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(_class, _basetype) \ #define NS_IMPL_CYCLE_COLLECTING_RELEASE_AMBIGUOUS(_class, _basetype) \
NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _basetype, delete (this)) NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _basetype, NS_DELETEXPCOM(this))
#define NS_IMPL_CYCLE_COLLECTING_RELEASE(_class) \ #define NS_IMPL_CYCLE_COLLECTING_RELEASE(_class) \
NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _class, delete (this)) NS_IMPL_CYCLE_COLLECTING_RELEASE_FULL(_class, _class, NS_DELETEXPCOM(this))
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -1278,7 +1278,7 @@ NS_IMETHODIMP_(nsrefcnt) _class::Release(void) \
mRefCnt = 1; /* stabilize */ \ mRefCnt = 1; /* stabilize */ \
/* enable this to find non-threadsafe destructors: */ \ /* enable this to find non-threadsafe destructors: */ \
/* NS_ASSERT_OWNINGTHREAD(_class); */ \ /* NS_ASSERT_OWNINGTHREAD(_class); */ \
delete (this); \ NS_DELETEXPCOM(this); \
return 0; \ return 0; \
} \ } \
return count; \ return count; \

21
xpcom/glue/nsISupportsUtils.h
View File

@ -61,6 +61,27 @@
#include "nsISupportsImpl.h" #include "nsISupportsImpl.h"
#endif #endif
/**
* Macro for instantiating a new object that implements nsISupports.
* Note that you can only use this if you adhere to the no arguments
* constructor com policy (which you really should!).
* @param _result Where the new instance pointer is stored
* @param _type The type of object to call "new" with.
*/
#define NS_NEWXPCOM(_result,_type) \
PR_BEGIN_MACRO \
_result = new _type(); \
PR_END_MACRO
/**
* Macro for deleting an object that implements nsISupports.
* @param _ptr The object to delete.
*/
#define NS_DELETEXPCOM(_ptr) \
PR_BEGIN_MACRO \
delete (_ptr); \
PR_END_MACRO
/** /**
* Macro for adding a reference to an interface. * Macro for adding a reference to an interface.
* @param _ptr The interface pointer. * @param _ptr The interface pointer.

3
xpcom/io/nsInputStreamTee.cpp
View File

@ -306,7 +306,8 @@ NS_NewInputStreamTeeAsync(nsIInputStream **result,
{ {
nsresult rv; nsresult rv;
nsCOMPtr<nsIInputStreamTee> tee = new nsInputStreamTee(); nsCOMPtr<nsIInputStreamTee> tee;
NS_NEWXPCOM(tee, nsInputStreamTee);
if (!tee) if (!tee)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;

3
xpcom/io/nsMultiplexInputStream.cpp
View File

@ -398,7 +398,8 @@ nsMultiplexInputStreamConstructor(nsISupports *outer,
if (outer) if (outer)
return NS_ERROR_NO_AGGREGATION; return NS_ERROR_NO_AGGREGATION;
nsMultiplexInputStream *inst = new nsMultiplexInputStream(); nsMultiplexInputStream *inst;
NS_NEWXPCOM(inst, nsMultiplexInputStream);
if (!inst) if (!inst)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;

2
xpcom/proxy/src/nsProxyEventObject.cpp
View File

@ -113,7 +113,7 @@ nsProxyEventObject::Release(void)
// call the destructor outside of the lock so that we aren't holding the // call the destructor outside of the lock so that we aren't holding the
// lock when we release the object // lock when we release the object
delete this; NS_DELETEXPCOM(this);
return 0; return 0;
} }

2
xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp
View File

@ -702,7 +702,7 @@ xptiInterfaceInfo::Release(void)
mEntry = nsnull; mEntry = nsnull;
} }
delete this; NS_DELETEXPCOM(this);
return 0; return 0;
} }
return cnt; return cnt;

2
xpcom/tests/TestCOMArray.cpp
View File

@ -150,7 +150,7 @@ Bar::Release(void)
NS_LOG_RELEASE(this, mRefCnt, "Bar"); NS_LOG_RELEASE(this, mRefCnt, "Bar");
if (mRefCnt == 0) { if (mRefCnt == 0) {
mRefCnt = 1; /* stabilize */ mRefCnt = 1; /* stabilize */
delete this; NS_DELETEXPCOM(this);
return 0; return 0;
} }
return mRefCnt; return mRefCnt;

2
xpcom/threads/nsTimerImpl.cpp
View File

@ -91,7 +91,7 @@ NS_IMETHODIMP_(nsrefcnt) nsTimerImpl::Release(void)
/* enable this to find non-threadsafe destructors: */ /* enable this to find non-threadsafe destructors: */
/* NS_ASSERT_OWNINGTHREAD(nsTimerImpl); */ /* NS_ASSERT_OWNINGTHREAD(nsTimerImpl); */
delete this; NS_DELETEXPCOM(this);
return 0; return 0;
} }