From 54d2e9932fb6240501a34ed2e0a63abe48c45bfb Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Thu, 17 Sep 1998 21:27:22 +0000 Subject: [PATCH] Changed some AddRef/Release calls overto use XP-COM macros git-svn-id: svn://10.0.0.236/trunk@10315 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 27 ++++++++++--------- mozilla/webshell/src/nsDocumentViewer.cpp | 7 ++--- mozilla/webshell/src/nsPluginViewer.cpp | 4 +-- mozilla/webshell/src/nsThrobber.cpp | 11 ++++---- mozilla/webshell/src/nsWebShell.cpp | 27 ++++++++++--------- .../tests/viewer/nsEditorInterfaces.cpp | 12 ++++----- .../webshell/tests/viewer/nsEditorMode.cpp | 8 +++--- mozilla/webshell/tests/viewer/nsViewerApp.cpp | 6 ++--- 8 files changed, 53 insertions(+), 49 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 3d0c4835ff2..f5ba899be15 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -431,44 +431,44 @@ nsWebShell::QueryInterface(REFNSIID aIID, void** aInstancePtr) } if (aIID.Equals(kIWebShellIID)) { *aInstancePtr = (void*)(nsIWebShell*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIContentViewerContainerIID)) { *aInstancePtr = (void*)(nsIContentViewerContainer*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIScriptContextOwnerIID)) { *aInstancePtr = (void*)(nsIScriptContextOwner*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIDocumentLoaderObserverIID)) { *aInstancePtr = (void*)(nsIDocumentLoaderObserver*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIWebShellContainerIID)) { *aInstancePtr = (void*)(nsIWebShellContainer*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kILinkHandlerIID)) { //I added this for plugin support of jumping //through links. maybe there is a better way... MMP *aInstancePtr = (void*)(nsILinkHandler*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kRefreshURLIID)) { *aInstancePtr = (void*)(nsIRefreshUrl*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kISupportsIID)) { *aInstancePtr = (void*)(nsISupports*)(nsIWebShell*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (nsnull != mInnerWindow) { @@ -486,12 +486,12 @@ nsWebShell::QueryCapability(const nsIID &aIID, void** aInstancePtr) if (aIID.Equals(kILinkHandlerIID)) { *aInstancePtr = (void*) ((nsILinkHandler*)this); - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIScriptContextOwnerIID)) { *aInstancePtr = (void*) ((nsIScriptContextOwner*)this); - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } @@ -620,6 +620,7 @@ nsWebShell::Init(nsNativeWidget aNativeParent, mWindow->Create(aNativeParent, aBounds, nsWebShell::HandleEvent, mDeviceContext, nsnull, nsnull, &widgetInit); // Get rid of extra reference count + // XXX FIX ME... mWindow->Release(); } @@ -1696,7 +1697,7 @@ nsWebShell::CancelRefreshURLTimers(void) { mRefreshments.RemoveElementAt(tmp); if (timer) { timer->Cancel(); - timer->Release(); + NS_RELEASE(timer); } tmp++; } @@ -1847,7 +1848,7 @@ nsWebShellFactory::QueryInterface(const nsIID &aIID, void **aResult) return NS_NOINTERFACE; } - AddRef(); // Increase reference count for caller + NS_ADDREF_THIS(); // Increase reference count for caller return NS_OK; } @@ -1884,7 +1885,7 @@ nsWebShellFactory::CreateInstance(nsISupports *aOuter, goto done; } - inst = new nsWebShell(); + NS_NEWXPCOM(inst, nsWebShell); if (inst == NULL) { rv = NS_ERROR_OUT_OF_MEMORY; goto done; diff --git a/mozilla/webshell/src/nsDocumentViewer.cpp b/mozilla/webshell/src/nsDocumentViewer.cpp index 35854cc90b3..c62a8511488 100644 --- a/mozilla/webshell/src/nsDocumentViewer.cpp +++ b/mozilla/webshell/src/nsDocumentViewer.cpp @@ -150,17 +150,17 @@ nsresult DocumentViewerImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(kIContentViewerIID)) { *aInstancePtr = (void*)(nsIContentViewer*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIDocumentViewerIID)) { *aInstancePtr = (void*)(nsIDocumentViewer*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kISupportsIID)) { *aInstancePtr = (void*)(nsISupports*)(nsIContentViewer*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } return NS_NOINTERFACE; @@ -278,6 +278,7 @@ DocumentViewerImpl::Init(nsNativeWidget aNativeParent, // Init(...) will addref the Presentation Context... if (NS_OK == rv) { + // XXX FIX ME... mPresContext->Release(); } return rv; diff --git a/mozilla/webshell/src/nsPluginViewer.cpp b/mozilla/webshell/src/nsPluginViewer.cpp index 05e0f2cb8b1..1f22e602689 100644 --- a/mozilla/webshell/src/nsPluginViewer.cpp +++ b/mozilla/webshell/src/nsPluginViewer.cpp @@ -193,13 +193,13 @@ PluginViewerImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(kIContentViewerIID)) { nsIContentViewer* tmp = this; *aInstancePtr = (void*)tmp; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kISupportsIID)) { nsISupports* tmp = this; *aInstancePtr = (void*)tmp; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } return NS_NOINTERFACE; diff --git a/mozilla/webshell/src/nsThrobber.cpp b/mozilla/webshell/src/nsThrobber.cpp index 62c030fcbbc..0b47b11312c 100644 --- a/mozilla/webshell/src/nsThrobber.cpp +++ b/mozilla/webshell/src/nsThrobber.cpp @@ -111,7 +111,7 @@ public: nsrefcnt ReleaseObject() { NS_PRECONDITION(0 != mRefCnt, "dup release"); if (--mRefCnt == 0) { - delete this; + NS_DELETEXPCOM(this); return 0; } return mRefCnt; @@ -123,17 +123,17 @@ public: } if (aIID.Equals(kIThrobberIID)) { *aInstancePtr = (void*)(nsIThrobber*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIImageObserverIID)) { *aInstancePtr = (void*)(nsIImageRequestObserver*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kISupportsIID)) { *aInstancePtr = (void*)(nsISupports*)(nsIThrobber*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (nsnull != mInnerWidget) { @@ -333,6 +333,7 @@ nsThrobber::Init(nsIWidget* aParent, const nsRect& aBounds) } else { // Get rid of extra reference count + // XXX FIX ME... mWidget->Release(); mWidget->Create(aParent, aBounds, HandleThrobberEvent, NULL); } @@ -549,7 +550,7 @@ nsThrobberFactory::QueryInterface(const nsIID &aIID, void **aResult) return NS_NOINTERFACE; } - AddRef(); // Increase reference count for caller + NS_ADDREF_THIS(); // Increase reference count for caller return NS_OK; } diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 3d0c4835ff2..f5ba899be15 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -431,44 +431,44 @@ nsWebShell::QueryInterface(REFNSIID aIID, void** aInstancePtr) } if (aIID.Equals(kIWebShellIID)) { *aInstancePtr = (void*)(nsIWebShell*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIContentViewerContainerIID)) { *aInstancePtr = (void*)(nsIContentViewerContainer*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIScriptContextOwnerIID)) { *aInstancePtr = (void*)(nsIScriptContextOwner*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIDocumentLoaderObserverIID)) { *aInstancePtr = (void*)(nsIDocumentLoaderObserver*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIWebShellContainerIID)) { *aInstancePtr = (void*)(nsIWebShellContainer*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kILinkHandlerIID)) { //I added this for plugin support of jumping //through links. maybe there is a better way... MMP *aInstancePtr = (void*)(nsILinkHandler*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kRefreshURLIID)) { *aInstancePtr = (void*)(nsIRefreshUrl*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kISupportsIID)) { *aInstancePtr = (void*)(nsISupports*)(nsIWebShell*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (nsnull != mInnerWindow) { @@ -486,12 +486,12 @@ nsWebShell::QueryCapability(const nsIID &aIID, void** aInstancePtr) if (aIID.Equals(kILinkHandlerIID)) { *aInstancePtr = (void*) ((nsILinkHandler*)this); - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIScriptContextOwnerIID)) { *aInstancePtr = (void*) ((nsIScriptContextOwner*)this); - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } @@ -620,6 +620,7 @@ nsWebShell::Init(nsNativeWidget aNativeParent, mWindow->Create(aNativeParent, aBounds, nsWebShell::HandleEvent, mDeviceContext, nsnull, nsnull, &widgetInit); // Get rid of extra reference count + // XXX FIX ME... mWindow->Release(); } @@ -1696,7 +1697,7 @@ nsWebShell::CancelRefreshURLTimers(void) { mRefreshments.RemoveElementAt(tmp); if (timer) { timer->Cancel(); - timer->Release(); + NS_RELEASE(timer); } tmp++; } @@ -1847,7 +1848,7 @@ nsWebShellFactory::QueryInterface(const nsIID &aIID, void **aResult) return NS_NOINTERFACE; } - AddRef(); // Increase reference count for caller + NS_ADDREF_THIS(); // Increase reference count for caller return NS_OK; } @@ -1884,7 +1885,7 @@ nsWebShellFactory::CreateInstance(nsISupports *aOuter, goto done; } - inst = new nsWebShell(); + NS_NEWXPCOM(inst, nsWebShell); if (inst == NULL) { rv = NS_ERROR_OUT_OF_MEMORY; goto done; diff --git a/mozilla/webshell/tests/viewer/nsEditorInterfaces.cpp b/mozilla/webshell/tests/viewer/nsEditorInterfaces.cpp index 80ec20a1b2e..aa10578cec5 100644 --- a/mozilla/webshell/tests/viewer/nsEditorInterfaces.cpp +++ b/mozilla/webshell/tests/viewer/nsEditorInterfaces.cpp @@ -41,17 +41,17 @@ nsresult nsEditorKeyListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); if (aIID.Equals(kISupportsIID)) { *aInstancePtr = (void*)(nsISupports*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIDOMEventListenerIID)) { *aInstancePtr = (void*)(nsIDOMEventListener*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIDOMKeyListenerIID)) { *aInstancePtr = (void*)(nsIDOMKeyListener*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } return NS_NOINTERFACE; @@ -149,17 +149,17 @@ nsresult nsEditorMouseListener::QueryInterface(REFNSIID aIID, void** aInstancePt static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); if (aIID.Equals(kISupportsIID)) { *aInstancePtr = (void*)(nsISupports*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIDOMEventListenerIID)) { *aInstancePtr = (void*)(nsIDOMEventListener*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kIDOMMouseListenerIID)) { *aInstancePtr = (void*)(nsIDOMMouseListener*)this; - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } return NS_NOINTERFACE; diff --git a/mozilla/webshell/tests/viewer/nsEditorMode.cpp b/mozilla/webshell/tests/viewer/nsEditorMode.cpp index 93105a4a1b3..317534a65b2 100644 --- a/mozilla/webshell/tests/viewer/nsEditorMode.cpp +++ b/mozilla/webshell/tests/viewer/nsEditorMode.cpp @@ -115,7 +115,7 @@ nsresult GetFirstTextNode(nsIDOMNode *aNode, nsIDOMNode **aRetNode) } else if (aNode->TEXT == mType) { *aRetNode = aNode; - aNode->AddRef(); + NS_ADDREF(aNode); } return NS_OK; @@ -125,7 +125,7 @@ nsresult nsGetCurrentNode(nsIDOMNode ** aNode) { if (kCurrentNode != nsnull) { *aNode = kCurrentNode; - kCurrentNode->AddRef(); + NS_ADDREF(kCurrentNode); return NS_OK; } @@ -138,7 +138,7 @@ nsresult nsGetCurrentNode(nsIDOMNode ** aNode) NS_RELEASE(mFirstTextNode); NS_RELEASE(mDocNode); *aNode = kCurrentNode; - kCurrentNode->AddRef(); + NS_ADDREF(kCurrentNode); return NS_OK; } @@ -150,7 +150,7 @@ nsresult nsSetCurrentNode(nsIDOMNode * aNode) { NS_IF_RELEASE(kCurrentNode); kCurrentNode = aNode; - kCurrentNode->AddRef(); + NS_ADDREF(kCurrentNode); return NS_OK; } diff --git a/mozilla/webshell/tests/viewer/nsViewerApp.cpp b/mozilla/webshell/tests/viewer/nsViewerApp.cpp index bbc86aa87e4..dfc7a974b63 100644 --- a/mozilla/webshell/tests/viewer/nsViewerApp.cpp +++ b/mozilla/webshell/tests/viewer/nsViewerApp.cpp @@ -99,12 +99,12 @@ nsViewerApp::QueryInterface(REFNSIID aIID, void** aInstancePtrResult) } if (aIID.Equals(kINetContainerApplicationIID)) { *aInstancePtrResult = (void*) ((nsIBrowserWindow*)this); - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } if (aIID.Equals(kISupportsIID)) { *aInstancePtrResult = (void*) ((nsISupports*)((nsIBrowserWindow*)this)); - AddRef(); + NS_ADDREF_THIS(); return NS_OK; } return NS_NOINTERFACE; @@ -275,7 +275,7 @@ NS_IMETHODIMP nsViewerApp::ProcessArguments(int argc, char** argv) { mCrawler = new nsWebCrawler(this); - mCrawler->AddRef(); + NS_ADDREF(mCrawler); int i; for (i = 1; i < argc; i++) {