diff --git a/mozilla/accessible/src/atk/nsAppRootAccessible.cpp b/mozilla/accessible/src/atk/nsAppRootAccessible.cpp index ff5b3302108..5a2e38ddb08 100644 --- a/mozilla/accessible/src/atk/nsAppRootAccessible.cpp +++ b/mozilla/accessible/src/atk/nsAppRootAccessible.cpp @@ -681,9 +681,8 @@ nsAppRootAccessible::AddRootAccessible(nsRootAccessibleWrap *aRootAccWrap) NS_ENSURE_ARG_POINTER(aRootAccWrap); nsresult rv = NS_ERROR_FAILURE; - nsCOMPtr docAcc; - rv = aRootAccWrap->QueryInterface(NS_GET_IID(nsIAccessibleDocument), - getter_AddRefs(docAcc)); + nsCOMPtr docAcc = + do_QueryInterface(aRootAccWrap, &rv); NS_ENSURE_SUCCESS(rv, rv); // add by weak reference @@ -711,14 +710,13 @@ nsAppRootAccessible::RemoveRootAccessible(nsRootAccessibleWrap *aRootAccWrap) PRUint32 index = 0; nsresult rv = NS_ERROR_FAILURE; - nsCOMPtr docAcc; - rv = aRootAccWrap->QueryInterface(NS_GET_IID(nsIAccessibleDocument), - getter_AddRefs(docAcc)); + nsCOMPtr docAcc = + do_QueryInterface(aRootAccWrap, &rv); NS_ENSURE_SUCCESS(rv, rv); // we must use weak ref to get the index nsCOMPtr weakPtr = - getter_AddRefs(NS_GetWeakReference(docAcc)); + do_GetWeakReference(docAcc); rv = mChildren->IndexOf(0, weakPtr, &index); #ifdef MAI_LOGGING diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 0bd6b01065d..00fb406ba3c 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -731,7 +731,7 @@ nsDocument::ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup) mDocumentBaseURL = mDocumentURL; if (aLoadGroup) { - mDocumentLoadGroup = getter_AddRefs(NS_GetWeakReference(aLoadGroup)); + mDocumentLoadGroup = do_GetWeakReference(aLoadGroup); // there was an assertion here that aLoadGroup was not null. This // is no longer valid nsWebShell::SetDocument does not create a // load group, and it works just fine. @@ -4102,7 +4102,7 @@ nsDocument::RemoveReference(void *aKey, nsISupports **aOldReference) NS_IMETHODIMP nsDocument::SetContainer(nsISupports *aContainer) { - mDocumentContainer = dont_AddRef(NS_GetWeakReference(aContainer)); + mDocumentContainer = do_GetWeakReference(aContainer); return NS_OK; } diff --git a/mozilla/content/base/src/nsSelection.cpp b/mozilla/content/base/src/nsSelection.cpp index 1769c961cc9..a9314af8ac3 100644 --- a/mozilla/content/base/src/nsSelection.cpp +++ b/mozilla/content/base/src/nsSelection.cpp @@ -4703,7 +4703,7 @@ NS_IMPL_RELEASE(nsTypedSelection) NS_IMETHODIMP nsTypedSelection::SetPresShell(nsIPresShell *aPresShell) { - mPresShellWeak = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShellWeak = do_GetWeakReference(aPresShell); return NS_OK; } @@ -7035,7 +7035,7 @@ nsTypedSelection::GetPresShell(nsIPresShell **aPresShell) nsCOMPtr shell; rv = presContext->GetShell(getter_AddRefs(shell)); - mPresShellWeak = getter_AddRefs(NS_GetWeakReference(shell)); // the presshell owns us, so no addref + mPresShellWeak = do_GetWeakReference(shell); // the presshell owns us, so no addref if (mPresShellWeak) NS_ADDREF(*aPresShell = shell); return rv; diff --git a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp index 0558bb23a2b..50512d6a688 100644 --- a/mozilla/content/html/style/src/nsComputedDOMStyle.cpp +++ b/mozilla/content/html/style/src/nsComputedDOMStyle.cpp @@ -154,7 +154,7 @@ nsComputedDOMStyle::Init(nsIDOMElement *aElement, NS_ENSURE_ARG_POINTER(aElement); NS_ENSURE_ARG_POINTER(aPresShell); - mPresShellWeak = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShellWeak = do_GetWeakReference(aPresShell); mContent = do_QueryInterface(aElement); if (!mContent) { diff --git a/mozilla/content/svg/content/src/nsSVGLength.cpp b/mozilla/content/svg/content/src/nsSVGLength.cpp index 84bc6bd6609..5055f0b3528 100644 --- a/mozilla/content/svg/content/src/nsSVGLength.cpp +++ b/mozilla/content/svg/content/src/nsSVGLength.cpp @@ -128,7 +128,7 @@ nsSVGLength::nsSVGLength(float value, nsresult nsSVGLength::Init(nsIDOMSVGElement* owner) { NS_ASSERTION(owner, "need owner"); - mOwnerElementRef = NS_GetWeakReference(owner); + mOwnerElementRef = do_GetWeakReference(owner); NS_ENSURE_TRUE(mOwnerElementRef, NS_ERROR_FAILURE); return NS_OK; } diff --git a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp index 5242dae4e92..d88e0ef4ddc 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -236,7 +236,7 @@ nsXBLPrototypeBinding::nsXBLPrototypeBinding(const nsACString& aID, mID = ToNewCString(aID); - mXBLDocInfoWeak = getter_AddRefs(NS_GetWeakReference(aInfo)); + mXBLDocInfoWeak = do_GetWeakReference(aInfo); gRefCnt++; // printf("REF COUNT UP: %d %s\n", gRefCnt, (const char*)mID); diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp index ab1bbf27964..94603a380b7 100644 --- a/mozilla/content/xbl/src/nsXBLService.cpp +++ b/mozilla/content/xbl/src/nsXBLService.cpp @@ -277,7 +277,7 @@ nsXBLStreamListener::nsXBLStreamListener(nsXBLService* aXBLService, /* member initializers and constructor code */ mXBLService = aXBLService; mInner = aInner; - mDocument = getter_AddRefs(NS_GetWeakReference(aDocument)); + mDocument = do_GetWeakReference(aDocument); mBindingDocument = aBindingDocument; #ifdef MOZ_XUL gRefCnt++; diff --git a/mozilla/content/xul/document/src/nsXULContentSink.cpp b/mozilla/content/xul/document/src/nsXULContentSink.cpp index 96aa009487f..c1007cc0abc 100644 --- a/mozilla/content/xul/document/src/nsXULContentSink.cpp +++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp @@ -581,7 +581,7 @@ XULContentSinkImpl::Init(nsIDocument* aDocument, nsIXULPrototypeDocument* aProto nsresult rv; - mDocument = getter_AddRefs(NS_GetWeakReference(aDocument)); + mDocument = do_GetWeakReference(aDocument); mPrototype = aPrototype; rv = mPrototype->GetURI(getter_AddRefs(mDocumentURL)); diff --git a/mozilla/content/xul/document/src/nsXULControllers.cpp b/mozilla/content/xul/document/src/nsXULControllers.cpp index 839bab2c8e0..efea2305b8d 100644 --- a/mozilla/content/xul/document/src/nsXULControllers.cpp +++ b/mozilla/content/xul/document/src/nsXULControllers.cpp @@ -124,7 +124,7 @@ nsXULControllers::GetCommandDispatcher(nsIDOMXULCommandDispatcher** _result) NS_IMETHODIMP nsXULControllers::SetCommandDispatcher(nsIDOMXULCommandDispatcher* aCommandDispatcher) { - mCommandDispatcher = getter_AddRefs(NS_GetWeakReference(aCommandDispatcher)); + mCommandDispatcher = do_GetWeakReference(aCommandDispatcher); return NS_OK; } diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 9199917884a..a1e1b7a2071 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -570,7 +570,7 @@ nsXULDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsIStreamListener **aDocListener, PRBool aReset, nsIContentSink* aSink) { - mDocumentLoadGroup = getter_AddRefs(NS_GetWeakReference(aLoadGroup)); + mDocumentLoadGroup = do_GetWeakReference(aLoadGroup); mDocumentTitle.Truncate(); diff --git a/mozilla/docshell/base/nsDSURIContentListener.cpp b/mozilla/docshell/base/nsDSURIContentListener.cpp index fd8cb219d75..b4b59e2ecbf 100644 --- a/mozilla/docshell/base/nsDSURIContentListener.cpp +++ b/mozilla/docshell/base/nsDSURIContentListener.cpp @@ -228,7 +228,7 @@ nsDSURIContentListener::SetParentContentListener(nsIURIContentListener* // Store the parent listener as a weak ref. Parents not supporting // nsISupportsWeakReference assert but may still be used. mParentContentListener = nsnull; - mWeakParentContentListener = getter_AddRefs(NS_GetWeakReference(aParentListener)); + mWeakParentContentListener = do_GetWeakReference(aParentListener); if (!mWeakParentContentListener) { mParentContentListener = aParentListener; diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 804a24cdd98..ccc2884c65b 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -7077,7 +7077,7 @@ nsDocShellFocusController::ClosingDown(nsIDocShell* aDocShell) nsDocShell::InterfaceRequestorProxy::InterfaceRequestorProxy(nsIInterfaceRequestor* p) { if (p) { - mWeakPtr = getter_AddRefs(NS_GetWeakReference(p)); + mWeakPtr = do_GetWeakReference(p); } } diff --git a/mozilla/dom/src/base/nsBarProps.cpp b/mozilla/dom/src/base/nsBarProps.cpp index e4f7de54a78..7d564c92d69 100644 --- a/mozilla/dom/src/base/nsBarProps.cpp +++ b/mozilla/dom/src/base/nsBarProps.cpp @@ -268,7 +268,7 @@ ScrollbarsPropImpl::ScrollbarsPropImpl(GlobalWindowImpl *aWindow) { mDOMWindow = aWindow; nsISupports *supwin = NS_STATIC_CAST(nsIScriptGlobalObject *, aWindow); - mDOMWindowWeakref = getter_AddRefs(NS_GetWeakReference(supwin)); + mDOMWindowWeakref = do_GetWeakReference(supwin); } ScrollbarsPropImpl::~ScrollbarsPropImpl() diff --git a/mozilla/editor/composer/src/nsEditingSession.cpp b/mozilla/editor/composer/src/nsEditingSession.cpp index 16faea6a8c1..26fb13ad54f 100644 --- a/mozilla/editor/composer/src/nsEditingSession.cpp +++ b/mozilla/editor/composer/src/nsEditingSession.cpp @@ -130,7 +130,7 @@ nsEditingSession::Init(nsIDOMWindow *aWindow) nsresult rv = GetDocShellFromWindow(aWindow, getter_AddRefs(docShell)); if (NS_FAILED(rv)) return rv; - mEditingShell = getter_AddRefs(NS_GetWeakReference(docShell)); + mEditingShell = do_GetWeakReference(docShell); if (!mEditingShell) return NS_ERROR_NO_INTERFACE; return NS_OK; @@ -154,7 +154,7 @@ nsEditingSession::MakeWindowEditable(nsIDOMWindow *aWindow, { mEditorType.Truncate(); mEditorFlags = 0; - mWindowToBeEdited = getter_AddRefs(NS_GetWeakReference(aWindow)); + mWindowToBeEdited = do_GetWeakReference(aWindow); // disable plugins nsCOMPtr docShell; diff --git a/mozilla/editor/libeditor/base/PlaceholderTxn.cpp b/mozilla/editor/libeditor/base/PlaceholderTxn.cpp index 9948ac96157..c638d42ca0a 100644 --- a/mozilla/editor/libeditor/base/PlaceholderTxn.cpp +++ b/mozilla/editor/libeditor/base/PlaceholderTxn.cpp @@ -286,7 +286,7 @@ NS_IMETHODIMP PlaceholderTxn::EndPlaceHolderBatch() NS_IMETHODIMP PlaceholderTxn::ForwardEndBatchTo(nsIAbsorbingTransaction *aForwardingAddress) { - mForwarding = getter_AddRefs( NS_GetWeakReference(aForwardingAddress) ); + mForwarding = do_GetWeakReference(aForwardingAddress); return NS_OK; } diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index abcbe1a8096..1259e415e91 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -258,9 +258,9 @@ nsEditor::Init(nsIDOMDocument *aDoc, nsIPresShell* aPresShell, nsIContent *aRoot return NS_ERROR_NULL_POINTER; mFlags = aFlags; - mDocWeak = getter_AddRefs( NS_GetWeakReference(aDoc) ); // weak reference to doc - mPresShellWeak = getter_AddRefs( NS_GetWeakReference(aPresShell) ); // weak reference to pres shell - mSelConWeak = getter_AddRefs( NS_GetWeakReference(aSelCon) ); // weak reference to selectioncontroller + mDocWeak = do_GetWeakReference(aDoc); // weak reference to doc + mPresShellWeak = do_GetWeakReference(aPresShell); // weak reference to pres shell + mSelConWeak = do_GetWeakReference(aSelCon); // weak reference to selectioncontroller nsCOMPtr ps = do_QueryReferent(mPresShellWeak); if (!ps) return NS_ERROR_NOT_INITIALIZED; @@ -466,7 +466,7 @@ nsEditor::DoTransaction(nsITransaction *aTxn) // due to our broken interface model for transactions. // save off weak reference to placeholder txn - mPlaceHolderTxn = getter_AddRefs( NS_GetWeakReference(plcTxn) ); + mPlaceHolderTxn = do_GetWeakReference(plcTxn); plcTxn->Init(mPlaceHolderName, mSelState, this); mSelState = nsnull; // placeholder txn took ownership of this pointer @@ -488,7 +488,7 @@ nsEditor::DoTransaction(nsITransaction *aTxn) // either the one we just created, or an earlier one that we are now merging // into. From here on out remember this placeholder instead of the one // we just created. - mPlaceHolderTxn = getter_AddRefs( NS_GetWeakReference(plcTxn) ); + mPlaceHolderTxn = do_GetWeakReference(plcTxn); } } } diff --git a/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp b/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp index 83a308553b4..a58fede8f23 100644 --- a/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp @@ -88,7 +88,7 @@ if (!theLoadGroup) error; nsCOMPtr listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl)); - //nsCOMPtr thisListener(dont_AddRef(NS_GetWeakReference(listener))); + //nsCOMPtr thisListener(do_GetWeakReference(listener)); //qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener)); // this calls nsIStreamListener::OnDataAvailable() diff --git a/mozilla/editor/txmgr/src/nsTransactionList.cpp b/mozilla/editor/txmgr/src/nsTransactionList.cpp index af1d8bf272a..1066f0cdc8a 100644 --- a/mozilla/editor/txmgr/src/nsTransactionList.cpp +++ b/mozilla/editor/txmgr/src/nsTransactionList.cpp @@ -48,7 +48,7 @@ nsTransactionList::nsTransactionList(nsITransactionManager *aTxnMgr, nsTransacti , mTxnItem(0) { if (aTxnMgr) - mTxnMgr = getter_AddRefs(NS_GetWeakReference(aTxnMgr)); + mTxnMgr = do_GetWeakReference(aTxnMgr); } nsTransactionList::nsTransactionList(nsITransactionManager *aTxnMgr, nsTransactionItem *aTxnItem) @@ -56,7 +56,7 @@ nsTransactionList::nsTransactionList(nsITransactionManager *aTxnMgr, nsTransacti , mTxnItem(aTxnItem) { if (aTxnMgr) - mTxnMgr = getter_AddRefs(NS_GetWeakReference(aTxnMgr)); + mTxnMgr = do_GetWeakReference(aTxnMgr); } nsTransactionList::~nsTransactionList() diff --git a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp index 79e7941543e..5c36202abe7 100644 --- a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp +++ b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp @@ -1173,7 +1173,7 @@ HRESULT CMozillaBrowser::CreateBrowser() // Subscribe for progress notifications nsCOMPtr listener( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mWebBrowserContainer)))); + do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mWebBrowserContainer))); mWebBrowser->AddWebBrowserListener(listener, NS_GET_IID(nsIWebProgressListener)); // Visible diff --git a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp index 99a56055fa3..d84f7510d94 100644 --- a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp +++ b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp @@ -357,7 +357,7 @@ void CBrowserShell::FinishCreateSelf() ThrowIfNil_(mEventSink); // Hook up our progress listener - nsWeakPtr weakling(dont_AddRef(NS_GetWeakReference((nsIWebProgressListener *)mProgressListener))); + nsWeakPtr weakling(do_GetWeakReference((nsIWebProgressListener *)mProgressListener)); rv = mWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); NS_ASSERTION(NS_SUCCEEDED(rv), "Call to AddWebBrowserListener failed"); diff --git a/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp b/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp index 789ecaa1c9d..d89115e28ba 100644 --- a/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp +++ b/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp @@ -538,7 +538,7 @@ NS_IMETHODIMP nsWebBrowserFind::SetCurrentSearchFrame(nsIDOMWindow * aCurrentSea { // is it ever valid to set this to null? NS_ENSURE_ARG(aCurrentSearchFrame); - mCurrentSearchFrame = getter_AddRefs(NS_GetWeakReference(aCurrentSearchFrame)); + mCurrentSearchFrame = do_GetWeakReference(aCurrentSearchFrame); return NS_OK; } @@ -555,7 +555,7 @@ NS_IMETHODIMP nsWebBrowserFind::SetRootSearchFrame(nsIDOMWindow * aRootSearchFra { // is it ever valid to set this to null? NS_ENSURE_ARG(aRootSearchFrame); - mRootSearchFrame = getter_AddRefs(NS_GetWeakReference(aRootSearchFrame)); + mRootSearchFrame = do_GetWeakReference(aRootSearchFrame); return NS_OK; } @@ -758,7 +758,7 @@ nsresult nsWebBrowserFind::OnFind(nsIDOMWindow *aFoundWindow) { nsCOMPtr windowInt = do_QueryInterface(aFoundWindow); focusController->SetFocusedWindow(windowInt); - mLastFocusedWindow = getter_AddRefs(NS_GetWeakReference(aFoundWindow)); + mLastFocusedWindow = do_GetWeakReference(aFoundWindow); } return NS_OK; diff --git a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp index 17b47256a44..e47215df47b 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp @@ -114,7 +114,7 @@ struct nsWatcherWindowEntry { nsWatcherWindowEntry(nsIDOMWindow *inWindow, nsIWebBrowserChrome *inChrome) { #ifdef USEWEAKREFS - mWindow = getter_AddRefs(NS_GetWeakReference(inWindow)); + mWindow = do_GetWeakReference(inWindow); #else mWindow = inWindow; #endif diff --git a/mozilla/embedding/qa/mozembed/src/nsQABrowserView.cpp b/mozilla/embedding/qa/mozembed/src/nsQABrowserView.cpp index 8472dc28c88..aa34dff2b78 100644 --- a/mozilla/embedding/qa/mozembed/src/nsQABrowserView.cpp +++ b/mozilla/embedding/qa/mozembed/src/nsQABrowserView.cpp @@ -135,7 +135,7 @@ nsQABrowserView::CreateBrowser(nativeWindow aNativeWnd, nsIWebBrowserChrome * aC // Register the QABrowserChrome object to receive progress messages // These callbacks will be used to update the status/progress bars - nsWeakPtr weakling(dont_AddRef(NS_GetWeakReference(aChrome))); + nsWeakPtr weakling(do_GetWeakReference(aChrome)); (void)mWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); // Finally, show the web browser window diff --git a/mozilla/embedding/qa/testembed/BrowserView.cpp b/mozilla/embedding/qa/testembed/BrowserView.cpp index 32a386e3035..42679d03dc2 100644 --- a/mozilla/embedding/qa/testembed/BrowserView.cpp +++ b/mozilla/embedding/qa/testembed/BrowserView.cpp @@ -259,7 +259,7 @@ HRESULT CBrowserView::CreateBrowser() /* // from WinEmbed.cpp nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, this)); - nsCOMPtr thisListener(dont_AddRef(NS_GetWeakReference(listener))); + nsCOMPtr thisListener(do_GetWeakReference(listener)); (void)mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIWebProgressListener)); @@ -290,7 +290,7 @@ HRESULT CBrowserView::DestroyBrowser() } /* nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl))); nsresult rv; rv = mWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); if (NS_FAILED(rv)) diff --git a/mozilla/embedding/qa/testembed/BrowserView.cpp.mod b/mozilla/embedding/qa/testembed/BrowserView.cpp.mod index be12d25c421..71b1f51b0c5 100644 --- a/mozilla/embedding/qa/testembed/BrowserView.cpp.mod +++ b/mozilla/embedding/qa/testembed/BrowserView.cpp.mod @@ -240,7 +240,7 @@ HRESULT CBrowserView::CreateBrowser() // Register the BrowserImpl object to receive progress messages // These callbacks will be used to update the status/progress bars nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl))); rv = mWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); if (NS_FAILED(rv)) @@ -275,7 +275,7 @@ HRESULT CBrowserView::DestroyBrowser() } nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl))); nsresult rv; rv = mWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); if (NS_FAILED(rv)) @@ -1509,7 +1509,7 @@ void CBrowserView::OnInterfacesNsishistory() // addSHistoryListener test nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, mpBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, mpBrowserImpl))); rv = mWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener)); if (NS_FAILED(rv)) @@ -1549,7 +1549,7 @@ void CBrowserView::OnInterfacesNsishistory() // RemoveSHistoryListener test /* nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, mpBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, mpBrowserImpl))); rv = theSessionHistory->RemoveSHistoryListener(weakling); */ } diff --git a/mozilla/embedding/qa/testembed/Tests.cpp b/mozilla/embedding/qa/testembed/Tests.cpp index 152ae44abaa..cc6dae1fdc1 100644 --- a/mozilla/embedding/qa/testembed/Tests.cpp +++ b/mozilla/embedding/qa/testembed/Tests.cpp @@ -486,7 +486,7 @@ void CTests::OnTestsCreateprofile() void CTests::OnTestsAddTooltipListener() { nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsITooltipListener*, qaBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsITooltipListener*, qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsITooltipListener)); RvTestResult(rv, "AddWebBrowserListener(). Add Tooltip Listener test", 2); @@ -497,7 +497,7 @@ void CTests::OnTestsAddTooltipListener() void CTests::OnTestsAddWebProgListener() { nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); RvTestResult(rv, "AddWebBrowserListener(). Add Web Prog Lstnr test", 2); @@ -510,7 +510,7 @@ void CTests::OnTestsAddHistoryListener() // addSHistoryListener test nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, qaBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener)); RvTestResult(rv, "AddWebBrowserListener(). Add History Lstnr test", 2); @@ -523,7 +523,7 @@ void CTests::OnTestsRemovehistorylistener() // RemoveSHistoryListener test nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, qaBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsISHistoryListener*, qaBrowserImpl))); rv = qaWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsISHistoryListener)); RvTestResult(rv, "RemoveWebBrowserListener(). Remove History Lstnr test", 2); @@ -534,7 +534,7 @@ void CTests::OnTestsRemovehistorylistener() void CTests::OnTestsAddUriContentListenerByWebBrowser() { nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsIURIContentListener*, qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIURIContentListener)); RvTestResult(rv, "AddWebBrowserListener(). add nsIURIContentListener test", 2); @@ -624,7 +624,7 @@ void CTests::OnTestsNSNewChannelAndAsyncOpen() QAOutput("AynchOpen() test.", 2); nsCOMPtr listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl)); - nsCOMPtr thisListener(dont_AddRef(NS_GetWeakReference(listener))); + nsCOMPtr thisListener(do_GetWeakReference(listener)); qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener)); if (!listener) @@ -809,7 +809,7 @@ void CTests::OnVerifybugs70228() void CTests::OnVerifybugs90195() { nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsITooltipListener*, qaBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsITooltipListener*, qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsITooltipListener)); RvTestResult(rv, "AddWebBrowserListener(). Add Tool Tip Lstnr test", 2); diff --git a/mozilla/embedding/qa/testembed/nsIWebBrow.cpp b/mozilla/embedding/qa/testembed/nsIWebBrow.cpp index 6a44ff5fa81..a3bb2f4ba07 100644 --- a/mozilla/embedding/qa/testembed/nsIWebBrow.cpp +++ b/mozilla/embedding/qa/testembed/nsIWebBrow.cpp @@ -73,7 +73,7 @@ void CNsIWebBrowser::WBAddListener(PRInt16 displayMode) { // AddWebBrowserListener nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIContextMenuListener*, qaBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsIContextMenuListener*, qaBrowserImpl))); rv = qaWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIContextMenuListener)); RvTestResult(rv, "AddWebBrowserListener(). nsIContextMenuListener test", displayMode); RvTestResultDlg(rv, "AddWebBrowserListener(). nsIContextMenuListener test", true); @@ -83,7 +83,7 @@ void CNsIWebBrowser::WBRemoveListener(PRInt16 displayMode) { // RemoveWebBrowserListener nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIContextMenuListener*, qaBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsIContextMenuListener*, qaBrowserImpl))); rv = qaWebBrowser->RemoveWebBrowserListener(weakling, NS_GET_IID(nsIContextMenuListener)); RvTestResult(rv, "RemoveWebBrowserListener(). nsIContextMenuListener test", displayMode); diff --git a/mozilla/embedding/qa/testembed/nsichanneltests.cpp b/mozilla/embedding/qa/testembed/nsichanneltests.cpp index 32cc70e8256..7dfca9619be 100644 --- a/mozilla/embedding/qa/testembed/nsichanneltests.cpp +++ b/mozilla/embedding/qa/testembed/nsichanneltests.cpp @@ -355,7 +355,7 @@ void CnsIChannelTests::OpenTest(nsIChannel *theChannel, PRInt16 displayMode) void CnsIChannelTests::AsyncOpenTest(nsIChannel *theChannel, PRInt16 displayMode) { nsCOMPtr listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl)); - nsCOMPtr thisListener(dont_AddRef(NS_GetWeakReference(listener))); + nsCOMPtr thisListener(do_GetWeakReference(listener)); qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener)); if (!theChannel) { diff --git a/mozilla/embedding/qa/testembed/nsirequest.cpp b/mozilla/embedding/qa/testembed/nsirequest.cpp index f024b9a5755..423e90a8ba5 100644 --- a/mozilla/embedding/qa/testembed/nsirequest.cpp +++ b/mozilla/embedding/qa/testembed/nsirequest.cpp @@ -254,7 +254,7 @@ nsIChannel * CNsIRequest::GetTheChannel(int i, nsILoadGroup *theLoadGroup) } nsCOMPtr listener(NS_STATIC_CAST(nsIStreamListener*, qaBrowserImpl)); - nsCOMPtr thisListener(dont_AddRef(NS_GetWeakReference(listener))); + nsCOMPtr thisListener(do_GetWeakReference(listener)); qaWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIStreamListener)); if (!listener) { diff --git a/mozilla/embedding/tests/mfcembed/BrowserView.cpp b/mozilla/embedding/tests/mfcembed/BrowserView.cpp index c134ca72656..2c6c63aa0af 100644 --- a/mozilla/embedding/tests/mfcembed/BrowserView.cpp +++ b/mozilla/embedding/tests/mfcembed/BrowserView.cpp @@ -252,7 +252,7 @@ HRESULT CBrowserView::CreateBrowser() // Register the BrowserImpl object to receive progress messages // These callbacks will be used to update the status/progress bars nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl)))); + do_GetWeakReference(NS_STATIC_CAST(nsIWebProgressListener*, mpBrowserImpl))); (void)mWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); diff --git a/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp b/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp index 9ff5796e1a5..ddb8665b133 100644 --- a/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp +++ b/mozilla/embedding/tests/os2Embed/WebBrowserChrome.cpp @@ -94,7 +94,7 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY, browserBaseWindow->Create(); nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, this)); - nsCOMPtr thisListener(dont_AddRef(NS_GetWeakReference(listener))); + nsCOMPtr thisListener(do_GetWeakReference(listener)); (void)mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIWebProgressListener)); diff --git a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp index 21e754d6e89..5da6e49ed44 100644 --- a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp +++ b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp @@ -94,7 +94,7 @@ nsresult WebBrowserChrome::CreateBrowser(PRInt32 aX, PRInt32 aY, browserBaseWindow->Create(); nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, this)); - nsCOMPtr thisListener(dont_AddRef(NS_GetWeakReference(listener))); + nsCOMPtr thisListener(do_GetWeakReference(listener)); (void)mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIWebProgressListener)); diff --git a/mozilla/embedding/tests/wxEmbed/GeckoContainer.cpp b/mozilla/embedding/tests/wxEmbed/GeckoContainer.cpp index b87810b2cb0..c23cf6c8af1 100644 --- a/mozilla/embedding/tests/wxEmbed/GeckoContainer.cpp +++ b/mozilla/embedding/tests/wxEmbed/GeckoContainer.cpp @@ -98,7 +98,7 @@ nsresult GeckoContainer::CreateBrowser(PRInt32 aX, PRInt32 aY, browserBaseWindow->Create(); nsCOMPtr listener(NS_STATIC_CAST(nsIWebProgressListener*, this)); - nsCOMPtr thisListener(dont_AddRef(NS_GetWeakReference(listener))); + nsCOMPtr thisListener(do_GetWeakReference(listener)); (void)mWebBrowser->AddWebBrowserListener(thisListener, NS_GET_IID(nsIWebProgressListener)); diff --git a/mozilla/extensions/wallet/src/nsBasicStreamGenerator.cpp b/mozilla/extensions/wallet/src/nsBasicStreamGenerator.cpp index f855d44f81f..9f4519fa605 100644 --- a/mozilla/extensions/wallet/src/nsBasicStreamGenerator.cpp +++ b/mozilla/extensions/wallet/src/nsBasicStreamGenerator.cpp @@ -66,7 +66,7 @@ NS_IMETHODIMP nsBasicStreamGenerator::Setup(PRUint32 salt, nsISupports *consumer /* reestablish setup */ if (consumer) { - mWeakPasswordSink = getter_AddRefs(NS_GetWeakReference(consumer, &rv)); + mWeakPasswordSink = do_GetWeakReference(consumer, &rv); if (NS_FAILED(rv)) return rv; } mSalt = salt; diff --git a/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp b/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp index decae1d67a9..d8614058803 100644 --- a/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsDOMParser.cpp @@ -524,7 +524,7 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream, // Register as a load listener on the document nsCOMPtr target(do_QueryInterface(domDocument)); if (target) { - nsWeakPtr requestWeak(getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIDOMParser*, this)))); + nsWeakPtr requestWeak(do_GetWeakReference(NS_STATIC_CAST(nsIDOMParser*, this))); nsLoadListenerProxy* proxy = new nsLoadListenerProxy(requestWeak); if (!proxy) return NS_ERROR_OUT_OF_MEMORY; diff --git a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp index b734fc9d496..c303b25cce2 100644 --- a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp @@ -1252,7 +1252,7 @@ nsXMLHttpRequest::Send(nsIVariant *aBody) // Register as a load listener on the document nsCOMPtr target(do_QueryInterface(mDocument)); if (target) { - nsWeakPtr requestWeak(getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIXMLHttpRequest*, this)))); + nsWeakPtr requestWeak(do_GetWeakReference(NS_STATIC_CAST(nsIXMLHttpRequest*, this))); nsLoadListenerProxy* proxy = new nsLoadListenerProxy(requestWeak); if (!proxy) return NS_ERROR_OUT_OF_MEMORY; diff --git a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp index 3a69cc9b60b..1117de832c3 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -205,7 +205,7 @@ NS_IMETHODIMP mozXMLTerminal::Init(nsIDocShell* aDocShell, mInitialized = PR_TRUE; // Containing docshell - mDocShell = getter_AddRefs(NS_GetWeakReference(aDocShell)); // weak ref + mDocShell = do_GetWeakReference(aDocShell); // weak ref mXMLTermShell = aXMLTermShell; // containing xmlterm shell; no addref @@ -423,8 +423,8 @@ NS_IMETHODIMP mozXMLTerminal::Activate(void) return NS_ERROR_FAILURE; // Save weak references to presentation shell and DOMDocument - mPresShell = getter_AddRefs(NS_GetWeakReference(presShell)); // weak ref - mDOMDocument = getter_AddRefs(NS_GetWeakReference(domDoc)); // weak ref + mPresShell = do_GetWeakReference(presShell); // weak ref + mDOMDocument = do_GetWeakReference(domDoc); // weak ref // Show caret ShowCaret(); diff --git a/mozilla/gfx/src/nsPrintSettingsImpl.cpp b/mozilla/gfx/src/nsPrintSettingsImpl.cpp index baced5ea7fe..c1f0569c958 100644 --- a/mozilla/gfx/src/nsPrintSettingsImpl.cpp +++ b/mozilla/gfx/src/nsPrintSettingsImpl.cpp @@ -129,7 +129,7 @@ NS_IMETHODIMP nsPrintSettings::SetPrintSession(nsIPrintSession *aPrintSession) // use a weak ref so that it doesn't have to be cleared. NS_ENSURE_ARG(aPrintSession); - mSession = getter_AddRefs(NS_GetWeakReference(aPrintSession)); + mSession = do_GetWeakReference(aPrintSession); if (!mSession) { // This may happen if the implementation of this object does // not support weak references - programmer error. diff --git a/mozilla/layout/base/nsCaret.cpp b/mozilla/layout/base/nsCaret.cpp index d904172af0f..1329650a9cb 100644 --- a/mozilla/layout/base/nsCaret.cpp +++ b/mozilla/layout/base/nsCaret.cpp @@ -111,7 +111,7 @@ NS_IMETHODIMP nsCaret::Init(nsIPresShell *inPresShell) { NS_ENSURE_ARG(inPresShell); - mPresShell = getter_AddRefs(NS_GetWeakReference(inPresShell)); // the presshell owns us, so no addref + mPresShell = do_GetWeakReference(inPresShell); // the presshell owns us, so no addref NS_ASSERTION(mPresShell, "Hey, pres shell should support weak refs"); // get nsILookAndFeel from the pres context, which has one cached. @@ -149,7 +149,7 @@ NS_IMETHODIMP nsCaret::Init(nsIPresShell *inPresShell) nsCOMPtr privateSelection = do_QueryInterface(domSelection); if (privateSelection) privateSelection->AddSelectionListener(this); - mDomSelectionWeak = getter_AddRefs(NS_GetWeakReference(domSelection)); + mDomSelectionWeak = do_GetWeakReference(domSelection); // set up the blink timer if (mVisible) @@ -218,7 +218,7 @@ NS_IMETHODIMP nsCaret::GetCaretDOMSelection(nsISelection **aDOMSel) NS_IMETHODIMP nsCaret::SetCaretDOMSelection(nsISelection *aDOMSel) { NS_ENSURE_ARG_POINTER(aDOMSel); - mDomSelectionWeak = getter_AddRefs( NS_GetWeakReference(aDOMSel) ); // weak reference to pres shell + mDomSelectionWeak = do_GetWeakReference(aDOMSel); // weak reference to pres shell return NS_OK; } diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp index eedbe49ae6d..82cd70fc775 100644 --- a/mozilla/layout/base/nsFrameManager.cpp +++ b/mozilla/layout/base/nsFrameManager.cpp @@ -1209,7 +1209,7 @@ nsresult CantRenderReplacedElementEvent::AddLoadGroupRequest(nsIPresShell* aPres rv = mDummyLayoutRequest->SetLoadGroup(loadGroup); if (NS_FAILED(rv)) return rv; - mPresShell = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShell = do_GetWeakReference(aPresShell); return loadGroup->AddRequest(mDummyLayoutRequest, nsnull); } diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index e267a612861..36137f82adc 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -798,7 +798,7 @@ nsDummyLayoutRequest::nsDummyLayoutRequest(nsIPresShell* aPresShell) NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create about:layout-dummy-request"); } - mPresShell = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShell = do_GetWeakReference(aPresShell); } @@ -6354,7 +6354,7 @@ ReflowEvent::ReflowEvent(nsIPresShell* aPresShell) { NS_ASSERTION(aPresShell, "Null parameters!"); - mPresShell = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShell = do_GetWeakReference(aPresShell); PL_InitEvent(this, aPresShell, (PLHandleEventProc) ::HandlePLEvent, diff --git a/mozilla/layout/base/src/nsCaret.cpp b/mozilla/layout/base/src/nsCaret.cpp index d904172af0f..1329650a9cb 100644 --- a/mozilla/layout/base/src/nsCaret.cpp +++ b/mozilla/layout/base/src/nsCaret.cpp @@ -111,7 +111,7 @@ NS_IMETHODIMP nsCaret::Init(nsIPresShell *inPresShell) { NS_ENSURE_ARG(inPresShell); - mPresShell = getter_AddRefs(NS_GetWeakReference(inPresShell)); // the presshell owns us, so no addref + mPresShell = do_GetWeakReference(inPresShell); // the presshell owns us, so no addref NS_ASSERTION(mPresShell, "Hey, pres shell should support weak refs"); // get nsILookAndFeel from the pres context, which has one cached. @@ -149,7 +149,7 @@ NS_IMETHODIMP nsCaret::Init(nsIPresShell *inPresShell) nsCOMPtr privateSelection = do_QueryInterface(domSelection); if (privateSelection) privateSelection->AddSelectionListener(this); - mDomSelectionWeak = getter_AddRefs(NS_GetWeakReference(domSelection)); + mDomSelectionWeak = do_GetWeakReference(domSelection); // set up the blink timer if (mVisible) @@ -218,7 +218,7 @@ NS_IMETHODIMP nsCaret::GetCaretDOMSelection(nsISelection **aDOMSel) NS_IMETHODIMP nsCaret::SetCaretDOMSelection(nsISelection *aDOMSel) { NS_ENSURE_ARG_POINTER(aDOMSel); - mDomSelectionWeak = getter_AddRefs( NS_GetWeakReference(aDOMSel) ); // weak reference to pres shell + mDomSelectionWeak = do_GetWeakReference(aDOMSel); // weak reference to pres shell return NS_OK; } diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index 9ef23ccf0d5..99cd95141d1 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -515,7 +515,7 @@ nsTextInputSelectionImpl::nsTextInputSelectionImpl(nsIFrameSelection *aSel, nsIP nsCOMPtr tracker = do_QueryInterface(aShell); mLimiter = aLimiter; mFrameSelection->Init(tracker, mLimiter); - mPresShellWeak = getter_AddRefs( NS_GetWeakReference(aShell) ); + mPresShellWeak = do_GetWeakReference(aShell); #ifdef IBMBIDI mBidiKeyboard = do_GetService("@mozilla.org/widget/bidikeyboard;1"); #endif diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index e2bc145006a..487ba192cd0 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -999,7 +999,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext* aPresContext, if (prefBranch) { nsCOMPtr prefBranchInternal(do_QueryInterface(prefBranch)); if (prefBranchInternal) { - mPrefBranchWeakRef = getter_AddRefs(NS_GetWeakReference(prefBranchInternal)); + mPrefBranchWeakRef = do_GetWeakReference(prefBranchInternal); prefBranchInternal->AddObserver(kFrameResizePref, this, PR_FALSE); } prefBranch->GetBoolPref(kFrameResizePref, &mForceFrameResizability); diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp index 1769c961cc9..a9314af8ac3 100644 --- a/mozilla/layout/generic/nsSelection.cpp +++ b/mozilla/layout/generic/nsSelection.cpp @@ -4703,7 +4703,7 @@ NS_IMPL_RELEASE(nsTypedSelection) NS_IMETHODIMP nsTypedSelection::SetPresShell(nsIPresShell *aPresShell) { - mPresShellWeak = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShellWeak = do_GetWeakReference(aPresShell); return NS_OK; } @@ -7035,7 +7035,7 @@ nsTypedSelection::GetPresShell(nsIPresShell **aPresShell) nsCOMPtr shell; rv = presContext->GetShell(getter_AddRefs(shell)); - mPresShellWeak = getter_AddRefs(NS_GetWeakReference(shell)); // the presshell owns us, so no addref + mPresShellWeak = do_GetWeakReference(shell); // the presshell owns us, so no addref if (mPresShellWeak) NS_ADDREF(*aPresShell = shell); return rv; diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp index eedbe49ae6d..82cd70fc775 100644 --- a/mozilla/layout/html/base/src/nsFrameManager.cpp +++ b/mozilla/layout/html/base/src/nsFrameManager.cpp @@ -1209,7 +1209,7 @@ nsresult CantRenderReplacedElementEvent::AddLoadGroupRequest(nsIPresShell* aPres rv = mDummyLayoutRequest->SetLoadGroup(loadGroup); if (NS_FAILED(rv)) return rv; - mPresShell = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShell = do_GetWeakReference(aPresShell); return loadGroup->AddRequest(mDummyLayoutRequest, nsnull); } diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index e267a612861..36137f82adc 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -798,7 +798,7 @@ nsDummyLayoutRequest::nsDummyLayoutRequest(nsIPresShell* aPresShell) NS_ASSERTION(NS_SUCCEEDED(rv), "unable to create about:layout-dummy-request"); } - mPresShell = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShell = do_GetWeakReference(aPresShell); } @@ -6354,7 +6354,7 @@ ReflowEvent::ReflowEvent(nsIPresShell* aPresShell) { NS_ASSERTION(aPresShell, "Null parameters!"); - mPresShell = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShell = do_GetWeakReference(aPresShell); PL_InitEvent(this, aPresShell, (PLHandleEventProc) ::HandlePLEvent, diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index e2bc145006a..487ba192cd0 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp @@ -999,7 +999,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext* aPresContext, if (prefBranch) { nsCOMPtr prefBranchInternal(do_QueryInterface(prefBranch)); if (prefBranchInternal) { - mPrefBranchWeakRef = getter_AddRefs(NS_GetWeakReference(prefBranchInternal)); + mPrefBranchWeakRef = do_GetWeakReference(prefBranchInternal); prefBranchInternal->AddObserver(kFrameResizePref, this, PR_FALSE); } prefBranch->GetBoolPref(kFrameResizePref, &mForceFrameResizability); diff --git a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp index 9ef23ccf0d5..99cd95141d1 100644 --- a/mozilla/layout/html/forms/src/nsTextControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsTextControlFrame.cpp @@ -515,7 +515,7 @@ nsTextInputSelectionImpl::nsTextInputSelectionImpl(nsIFrameSelection *aSel, nsIP nsCOMPtr tracker = do_QueryInterface(aShell); mLimiter = aLimiter; mFrameSelection->Init(tracker, mLimiter); - mPresShellWeak = getter_AddRefs( NS_GetWeakReference(aShell) ); + mPresShellWeak = do_GetWeakReference(aShell); #ifdef IBMBIDI mBidiKeyboard = do_GetService("@mozilla.org/widget/bidikeyboard;1"); #endif diff --git a/mozilla/layout/style/nsComputedDOMStyle.cpp b/mozilla/layout/style/nsComputedDOMStyle.cpp index 0558bb23a2b..50512d6a688 100644 --- a/mozilla/layout/style/nsComputedDOMStyle.cpp +++ b/mozilla/layout/style/nsComputedDOMStyle.cpp @@ -154,7 +154,7 @@ nsComputedDOMStyle::Init(nsIDOMElement *aElement, NS_ENSURE_ARG_POINTER(aElement); NS_ENSURE_ARG_POINTER(aPresShell); - mPresShellWeak = getter_AddRefs(NS_GetWeakReference(aPresShell)); + mPresShellWeak = do_GetWeakReference(aPresShell); mContent = do_QueryInterface(aElement); if (!mContent) { diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp index b3b85b539a9..3b5c51665c6 100644 --- a/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp @@ -1433,7 +1433,7 @@ nsMsgSearchScopeTerm::nsMsgSearchScopeTerm (nsIMsgSearchSession *session, m_attribute = attribute; m_folder = folder; m_searchServer = PR_TRUE; - m_searchSession = getter_AddRefs(NS_GetWeakReference(session)); + m_searchSession = do_GetWeakReference(session); } nsMsgSearchScopeTerm::nsMsgSearchScopeTerm () diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp index 4462ea6eeb2..9295b7a1113 100644 --- a/mozilla/mailnews/base/src/nsMessenger.cpp +++ b/mozilla/mailnews/base/src/nsMessenger.cpp @@ -1570,7 +1570,7 @@ NS_IMPL_ISUPPORTS1(SendLaterListener, nsIMsgSendLaterListener) SendLaterListener::SendLaterListener(nsIMessenger *aMessenger) { - m_messenger = getter_AddRefs(NS_GetWeakReference(aMessenger)); + m_messenger = do_GetWeakReference(aMessenger); } SendLaterListener::~SendLaterListener() diff --git a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp index e3bbf60ab6b..3ed629e7df7 100644 --- a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp +++ b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp @@ -291,7 +291,7 @@ nsMsgAccountManagerDataSource::Init() // get a weak ref to the account manager if (!mAccountManager) { am = do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv); - mAccountManager = getter_AddRefs(NS_GetWeakReference(am)); + mAccountManager = do_GetWeakReference(am); } else am = do_QueryReferent(mAccountManager); diff --git a/mozilla/mailnews/base/src/nsMsgQuickSearchDBView.cpp b/mozilla/mailnews/base/src/nsMsgQuickSearchDBView.cpp index cf0bd863ad6..c5a0163aa86 100644 --- a/mozilla/mailnews/base/src/nsMsgQuickSearchDBView.cpp +++ b/mozilla/mailnews/base/src/nsMsgQuickSearchDBView.cpp @@ -158,7 +158,7 @@ nsMsgQuickSearchDBView::GetSearchSession(nsIMsgSearchSession* *aSession) NS_IMETHODIMP nsMsgQuickSearchDBView::SetSearchSession(nsIMsgSearchSession *aSession) { - m_searchSession = getter_AddRefs(NS_GetWeakReference(aSession)); + m_searchSession = do_GetWeakReference(aSession); return NS_OK; } diff --git a/mozilla/mailnews/base/src/nsMsgWindow.cpp b/mozilla/mailnews/base/src/nsMsgWindow.cpp index 9183a2e5086..b0818ef2778 100644 --- a/mozilla/mailnews/base/src/nsMsgWindow.cpp +++ b/mozilla/mailnews/base/src/nsMsgWindow.cpp @@ -131,7 +131,7 @@ void nsMsgWindow::GetMessageWindowDocShell(nsIDocShell ** aDocShell) docShell = do_QueryInterface(msgDocShellItem); // we don't own mMessageWindowDocShell so don't try to keep a reference to it! - mMessageWindowDocShellWeak = getter_AddRefs(NS_GetWeakReference(docShell)); + mMessageWindowDocShellWeak = do_GetWeakReference(docShell); } } @@ -290,7 +290,7 @@ NS_IMETHODIMP nsMsgWindow::SetRootDocShell(nsIDocShell * aDocShell) mRootDocShellWeak = nsnull; if (aDocShell) { - mRootDocShellWeak = getter_AddRefs(NS_GetWeakReference(aDocShell)); + mRootDocShellWeak = do_GetWeakReference(aDocShell); aDocShell->SetParentURIContentListener(this); // be sure to set the application flag on the root docshell // so it knows we are a mail application. diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp index 6c1ff464b34..3edbadf43e9 100644 --- a/mozilla/mailnews/base/util/nsMsgFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp @@ -465,7 +465,7 @@ NS_IMETHODIMP nsMsgFolder::RemoveFolderListener(nsIFolderListener * listener) NS_IMETHODIMP nsMsgFolder::SetParent(nsIFolder *aParent) { - mParent = getter_AddRefs(NS_GetWeakReference(aParent)); + mParent = do_GetWeakReference(aParent); if (aParent) { nsresult rv; @@ -482,7 +482,7 @@ NS_IMETHODIMP nsMsgFolder::SetParent(nsIFolder *aParent) nsCOMPtr server; rv = parentMsgFolder->GetServer(getter_AddRefs(server)); if (NS_SUCCEEDED(rv) && server) - mServer = getter_AddRefs(NS_GetWeakReference(server)); + mServer = do_GetWeakReference(server); } } @@ -675,7 +675,7 @@ nsMsgFolder::parseURI(PRBool needServer) } - mServer = getter_AddRefs(NS_GetWeakReference(server)); + mServer = do_GetWeakReference(server); } /* !mServer */ diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index 0a75844c713..ea5a478e333 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -2276,7 +2276,7 @@ NS_IMETHODIMP QuotingOutputStreamListener::OnDataAvailable(nsIRequest *request, nsresult QuotingOutputStreamListener::SetComposeObj(nsIMsgCompose *obj) { - mWeakComposeObj = getter_AddRefs(NS_GetWeakReference(obj)); + mWeakComposeObj = do_GetWeakReference(obj); return NS_OK; } @@ -2634,7 +2634,7 @@ nsMsgComposeSendListener::~nsMsgComposeSendListener(void) NS_IMETHODIMP nsMsgComposeSendListener::SetMsgCompose(nsIMsgCompose *obj) { - mWeakComposeObj = getter_AddRefs(NS_GetWeakReference(obj)); + mWeakComposeObj = do_GetWeakReference(obj); return NS_OK; } diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.cpp b/mozilla/mailnews/imap/src/nsImapProtocol.cpp index c3543873922..aa01a31d446 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.cpp +++ b/mozilla/mailnews/imap/src/nsImapProtocol.cpp @@ -699,7 +699,7 @@ nsresult nsImapProtocol::SetupWithUrl(nsIURI * aURL, nsISupports* aConsumer) { nsCOMPtr mailnewsUrl = do_QueryInterface(m_runningUrl); rv = mailnewsUrl->GetServer(getter_AddRefs(server)); - m_server = getter_AddRefs(NS_GetWeakReference(server)); + m_server = do_GetWeakReference(server); } nsCOMPtr imapServer = do_QueryInterface(server); diff --git a/mozilla/mailnews/imap/src/nsImapUndoTxn.cpp b/mozilla/mailnews/imap/src/nsImapUndoTxn.cpp index ea172a99015..4ee562f31dd 100644 --- a/mozilla/mailnews/imap/src/nsImapUndoTxn.cpp +++ b/mozilla/mailnews/imap/src/nsImapUndoTxn.cpp @@ -73,8 +73,8 @@ nsImapMoveCopyMsgTxn::Init( m_srcMsgIdString = srcMsgIdString; m_idsAreUids = idsAreUids; m_isMove = isMove; - m_srcFolder = getter_AddRefs(NS_GetWeakReference(srcFolder)); - m_dstFolder = getter_AddRefs(NS_GetWeakReference(dstFolder)); + m_srcFolder = do_GetWeakReference(srcFolder); + m_dstFolder = do_GetWeakReference(dstFolder); m_eventQueue = do_QueryInterface(eventQueue, &rv); if (urlListener) m_urlListener = do_QueryInterface(urlListener, &rv); diff --git a/mozilla/mailnews/imap/src/nsImapUrl.cpp b/mozilla/mailnews/imap/src/nsImapUrl.cpp index 7cb9960b7d1..cabf1874709 100644 --- a/mozilla/mailnews/imap/src/nsImapUrl.cpp +++ b/mozilla/mailnews/imap/src/nsImapUrl.cpp @@ -206,7 +206,7 @@ NS_IMETHODIMP nsImapUrl::GetFolder(nsIMsgFolder **aMsgFolder) NS_IMETHODIMP nsImapUrl::SetFolder(nsIMsgFolder * aMsgFolder) { nsresult rv; - m_imapFolder = getter_AddRefs(NS_GetWeakReference(aMsgFolder, &rv)); + m_imapFolder = do_GetWeakReference(aMsgFolder, &rv); return rv; } @@ -226,7 +226,7 @@ NS_IMETHODIMP nsImapUrl::GetImapMailFolderSink(nsIImapMailFolderSink ** NS_IMETHODIMP nsImapUrl::SetImapMailFolderSink(nsIImapMailFolderSink * aImapMailFolderSink) { nsresult rv; - m_imapMailFolderSink = getter_AddRefs(NS_GetWeakReference(aImapMailFolderSink, &rv)); + m_imapMailFolderSink = do_GetWeakReference(aImapMailFolderSink, &rv); return rv; } @@ -244,7 +244,7 @@ NS_IMETHODIMP nsImapUrl::GetImapMessageSink(nsIImapMessageSink ** aImapMessageSi NS_IMETHODIMP nsImapUrl::SetImapMessageSink(nsIImapMessageSink * aImapMessageSink) { nsresult rv; - m_imapMessageSink = getter_AddRefs(NS_GetWeakReference(aImapMessageSink, &rv)); + m_imapMessageSink = do_GetWeakReference(aImapMessageSink, &rv); return rv; } @@ -262,7 +262,7 @@ NS_IMETHODIMP nsImapUrl::GetImapServerSink(nsIImapServerSink ** aImapServerSink) NS_IMETHODIMP nsImapUrl::SetImapServerSink(nsIImapServerSink * aImapServerSink) { nsresult rv; - m_imapServerSink = getter_AddRefs(NS_GetWeakReference(aImapServerSink, &rv)); + m_imapServerSink = do_GetWeakReference(aImapServerSink, &rv); return rv; } @@ -280,7 +280,7 @@ NS_IMETHODIMP nsImapUrl::GetImapExtensionSink(nsIImapExtensionSink ** aImapExten NS_IMETHODIMP nsImapUrl::SetImapExtensionSink(nsIImapExtensionSink * aImapExtensionSink) { nsresult rv; - m_imapExtensionSink = getter_AddRefs(NS_GetWeakReference(aImapExtensionSink, &rv)); + m_imapExtensionSink = do_GetWeakReference(aImapExtensionSink, &rv); return rv; } @@ -300,7 +300,7 @@ NS_IMETHODIMP nsImapUrl::SetImapMiscellaneousSink(nsIImapMiscellaneousSink * aImapMiscellaneousSink) { nsresult rv; - m_imapMiscellaneousSink = getter_AddRefs(NS_GetWeakReference(aImapMiscellaneousSink, &rv)); + m_imapMiscellaneousSink = do_GetWeakReference(aImapMiscellaneousSink, &rv); return rv; } diff --git a/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp b/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp index 51752f51fb0..9a74867549c 100644 --- a/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp +++ b/mozilla/mailnews/local/src/nsLocalUndoTxn.cpp @@ -124,7 +124,7 @@ nsLocalMoveCopyMsgTxn::SetSrcFolder(nsIMsgFolder* srcFolder) { nsresult rv = NS_ERROR_NULL_POINTER; if (srcFolder) - m_srcFolder = getter_AddRefs(NS_GetWeakReference(srcFolder, &rv)); + m_srcFolder = do_GetWeakReference(srcFolder, &rv); return rv; } @@ -133,7 +133,7 @@ nsLocalMoveCopyMsgTxn::SetDstFolder(nsIMsgFolder* dstFolder) { nsresult rv = NS_ERROR_NULL_POINTER; if (dstFolder) - m_dstFolder = getter_AddRefs(NS_GetWeakReference(dstFolder, &rv)); + m_dstFolder = do_GetWeakReference(dstFolder, &rv); return rv; } diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp index dccd00cdfa1..250c4110755 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.cpp +++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp @@ -227,7 +227,7 @@ nsMsgMailboxParser::nsMsgMailboxParser() : nsMsgLineBuffer(nsnull, PR_FALSE) nsMsgMailboxParser::nsMsgMailboxParser(nsIMsgFolder *aFolder) : nsMsgLineBuffer(nsnull, PR_FALSE) { Init(); - m_folder = getter_AddRefs(NS_GetWeakReference(aFolder)); + m_folder = do_GetWeakReference(aFolder); } nsMsgMailboxParser::~nsMsgMailboxParser() diff --git a/mozilla/modules/libpr0n/decoders/gif/imgContainerGIF.cpp b/mozilla/modules/libpr0n/decoders/gif/imgContainerGIF.cpp index 4624434ddbd..6c66a558bc8 100644 --- a/mozilla/modules/libpr0n/decoders/gif/imgContainerGIF.cpp +++ b/mozilla/modules/libpr0n/decoders/gif/imgContainerGIF.cpp @@ -73,7 +73,7 @@ NS_IMETHODIMP imgContainerGIF::Init(nscoord aWidth, nscoord aHeight, mSize.SizeTo(aWidth, aHeight); - mObserver = getter_AddRefs(NS_GetWeakReference(aObserver)); + mObserver = do_GetWeakReference(aObserver); return NS_OK; } diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 5085fee7c1e..c047123a648 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -1435,7 +1435,7 @@ nsPluginStreamInfo::RequestRead(nsByteRange* rangeList) return NS_ERROR_FAILURE; nsCOMPtr pWeakRefPluginStreamListenerPeer = - getter_AddRefs(NS_GetWeakReference(suppWeakRef)); + do_GetWeakReference(suppWeakRef); if (!pWeakRefPluginStreamListenerPeer) return NS_ERROR_FAILURE; @@ -2006,12 +2006,12 @@ nsPluginStreamListenerPeer::OnStartRequest(nsIRequest *request, nsISupports* aCo nsCOMPtr callbacks; channel->GetNotificationCallbacks(getter_AddRefs(callbacks)); if (callbacks) - mWeakPtrChannelCallbacks = getter_AddRefs(NS_GetWeakReference(callbacks)); + mWeakPtrChannelCallbacks = do_GetWeakReference(callbacks); nsCOMPtr loadGroup; channel->GetLoadGroup(getter_AddRefs(loadGroup)); if (loadGroup) - mWeakPtrChannelLoadGroup = getter_AddRefs(NS_GetWeakReference(loadGroup)); + mWeakPtrChannelLoadGroup = do_GetWeakReference(loadGroup); } PRInt32 length; @@ -3713,7 +3713,7 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType, if (document == currentdocument) return rv; - mCurrentDocument = getter_AddRefs(NS_GetWeakReference(document)); + mCurrentDocument = do_GetWeakReference(document); // ReloadPlugins will do the job smartly: nothing will be done // if no changes detected, in such a case just return diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp index 1288aae6eee..7a06785c00c 100644 --- a/mozilla/netwerk/base/src/nsIOService.cpp +++ b/mozilla/netwerk/base/src/nsIOService.cpp @@ -280,7 +280,7 @@ nsIOService::CacheProtocolHandler(const char *scheme, nsIProtocolHandler *handle #endif /* DEBUG_dp */ return NS_ERROR_FAILURE; } - mWeakHandler[i] = getter_AddRefs(NS_GetWeakReference(handler)); + mWeakHandler[i] = do_GetWeakReference(handler); return NS_OK; } } diff --git a/mozilla/netwerk/base/src/nsLoadGroup.cpp b/mozilla/netwerk/base/src/nsLoadGroup.cpp index 49100e97980..7434583bdc5 100644 --- a/mozilla/netwerk/base/src/nsLoadGroup.cpp +++ b/mozilla/netwerk/base/src/nsLoadGroup.cpp @@ -746,7 +746,7 @@ nsLoadGroup::GetRequests(nsISimpleEnumerator * *aRequests) NS_IMETHODIMP nsLoadGroup::SetGroupObserver(nsIRequestObserver* aObserver) { - mObserver = getter_AddRefs(NS_GetWeakReference(aObserver)); + mObserver = do_GetWeakReference(aObserver); return NS_OK; } diff --git a/mozilla/netwerk/dns/src/nsDnsService.cpp b/mozilla/netwerk/dns/src/nsDnsService.cpp index 18abaeffa08..37143d3c547 100644 --- a/mozilla/netwerk/dns/src/nsDnsService.cpp +++ b/mozilla/netwerk/dns/src/nsDnsService.cpp @@ -1235,7 +1235,7 @@ nsDNSService::InstallPrefObserver() if (NS_FAILED(rv)) return rv; // save for later - mPrefService = getter_AddRefs( NS_GetWeakReference(prefs)); + mPrefService = do_GetWeakReference(prefs); nsCOMPtr prefInternal = do_QueryInterface(prefs, &rv); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/rdf/datasource/src/nsLocalStore.cpp b/mozilla/rdf/datasource/src/nsLocalStore.cpp index 92aca6f8571..19b6856a72e 100644 --- a/mozilla/rdf/datasource/src/nsLocalStore.cpp +++ b/mozilla/rdf/datasource/src/nsLocalStore.cpp @@ -386,7 +386,7 @@ LocalStoreImpl::Init() // for later if (!gRDF) - gRDF = getter_AddRefs(NS_GetWeakReference(rdf)); + gRDF = do_GetWeakReference(rdf); rdf->RegisterDataSource(this, PR_FALSE); diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index 3a4884c9fba..a471ba63486 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -889,7 +889,7 @@ nsDocLoaderImpl::AddProgressListener(nsIWebProgressListener *aListener, PRUint32 aNotifyMask) { nsresult rv; - nsWeakPtr listener = getter_AddRefs(NS_GetWeakReference(aListener)); + nsWeakPtr listener = do_GetWeakReference(aListener); if (!listener) { return NS_ERROR_INVALID_ARG; } @@ -913,7 +913,7 @@ NS_IMETHODIMP nsDocLoaderImpl::RemoveProgressListener(nsIWebProgressListener *aListener) { nsresult rv; - nsWeakPtr listener = getter_AddRefs(NS_GetWeakReference(aListener)); + nsWeakPtr listener = do_GetWeakReference(aListener); if (!listener) { return NS_ERROR_INVALID_ARG; } diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index a1013488c91..3dd68df966b 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1417,7 +1417,7 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell, NS_ENSURE_SUCCESS(EnsureWebBrowserChrome(), NS_ERROR_FAILURE); mWebBrowser->SetContainerWindow(mWebBrowserChrome); nsWeakPtr weakling( - dont_AddRef(NS_GetWeakReference((nsIWebProgressListener*)mWebBrowserChrome))); + do_GetWeakReference((nsIWebProgressListener*)mWebBrowserChrome)); mWebBrowser->AddWebBrowserListener(weakling, NS_GET_IID(nsIWebProgressListener)); webBrowserWin->Create(); diff --git a/mozilla/widget/src/cocoa/nsMenuBarX.cpp b/mozilla/widget/src/cocoa/nsMenuBarX.cpp index f244ec2e482..2b46b77ec72 100644 --- a/mozilla/widget/src/cocoa/nsMenuBarX.cpp +++ b/mozilla/widget/src/cocoa/nsMenuBarX.cpp @@ -440,7 +440,7 @@ nsEventStatus nsMenuBarX::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWindow, void * menubarNode, void * aWebShell ) { - mWebShellWeakRef = getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIWebShell*, aWebShell))); + mWebShellWeakRef = do_GetWeakReference(NS_STATIC_CAST(nsIWebShell*, aWebShell)); nsIDOMNode* aDOMNode = NS_STATIC_CAST(nsIDOMNode*, menubarNode); mMenuBarContent = do_QueryInterface(aDOMNode); // strong ref NS_ASSERTION ( mMenuBarContent, "No content specified for this menubar" ); diff --git a/mozilla/widget/src/cocoa/nsMenuItemX.cpp b/mozilla/widget/src/cocoa/nsMenuItemX.cpp index 0c23b75657f..4beac03e709 100644 --- a/mozilla/widget/src/cocoa/nsMenuItemX.cpp +++ b/mozilla/widget/src/cocoa/nsMenuItemX.cpp @@ -98,7 +98,7 @@ NS_METHOD nsMenuItemX::Create ( nsIMenu* aParent, const nsString & aLabel, PRBoo { mContent = aNode; // addref mMenuParent = aParent; // weak - mWebShellWeakRef = getter_AddRefs(NS_GetWeakReference(aShell)); + mWebShellWeakRef = do_GetWeakReference(aShell); mEnabled = aEnabled; mMenuType = aItemType; diff --git a/mozilla/widget/src/cocoa/nsMenuX.cpp b/mozilla/widget/src/cocoa/nsMenuX.cpp index d396713eb8b..6c76f180ff8 100644 --- a/mozilla/widget/src/cocoa/nsMenuX.cpp +++ b/mozilla/widget/src/cocoa/nsMenuX.cpp @@ -150,7 +150,7 @@ NS_METHOD nsMenuX::Create(nsISupports * aParent, const nsAString &aLabel, const nsAString &aAccessKey, nsIChangeManager* aManager, nsIWebShell* aShell, nsIContent* aNode ) { - mWebShellWeakRef = getter_AddRefs(NS_GetWeakReference(aShell)); + mWebShellWeakRef = do_GetWeakReference(aShell); mMenuContent = aNode; // register this menu to be notified when changes are made to our content object diff --git a/mozilla/widget/src/gtk/nsWindow.cpp b/mozilla/widget/src/gtk/nsWindow.cpp index 7f5d08cc21e..372e32cb411 100644 --- a/mozilla/widget/src/gtk/nsWindow.cpp +++ b/mozilla/widget/src/gtk/nsWindow.cpp @@ -936,7 +936,7 @@ NS_IMETHODIMP nsWindow::CaptureRollupEvents(nsIRollupListener * aListener, } gRollupListener = aListener; - gRollupWidget = getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIWidget*,this))); + gRollupWidget = do_GetWeakReference(NS_STATIC_CAST(nsIWidget*,this)); } else { // make sure that the grab window is marked as released if (sGrabWindow == this) { diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp index 5c7d69f2112..376d5c27a42 100644 --- a/mozilla/widget/src/gtk2/nsWindow.cpp +++ b/mozilla/widget/src/gtk2/nsWindow.cpp @@ -1082,9 +1082,8 @@ nsWindow::CaptureRollupEvents(nsIRollupListener *aListener, if (aDoCapture) { gRollupListener = aListener; - gRollupWindow = - getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIWidget*, - this))); + gRollupWindow = do_GetWeakReference(NS_STATIC_CAST(nsIWidget*, + this)); gtk_grab_add(widget); GrabPointer(); GrabKeyboard(); diff --git a/mozilla/widget/src/mac/nsDynamicMDEF.cpp b/mozilla/widget/src/mac/nsDynamicMDEF.cpp index 0e215d18586..197b57b2f03 100644 --- a/mozilla/widget/src/mac/nsDynamicMDEF.cpp +++ b/mozilla/widget/src/mac/nsDynamicMDEF.cpp @@ -421,7 +421,7 @@ void nsBuildMenu(MenuHandle theMenu, PRBool isChild) gPreviousTopLevelMenuHandle = theMenu; gPreviousTopLevelMenu = menu; - gPreviousMenuBar = getter_AddRefs(NS_GetWeakReference(menubar)); + gPreviousMenuBar = do_GetWeakReference(menubar); //printf("exit BuildMenu \n"); return; } diff --git a/mozilla/widget/src/mac/nsMenu.cpp b/mozilla/widget/src/mac/nsMenu.cpp index c193443187b..27e4551b8e3 100644 --- a/mozilla/widget/src/mac/nsMenu.cpp +++ b/mozilla/widget/src/mac/nsMenu.cpp @@ -205,7 +205,7 @@ NS_METHOD nsMenu::Create( nsISupports * aParent, const nsAString &aLabel, const nsAString &aAccessKey, nsIChangeManager* aManager, nsIWebShell* aShell, nsIContent* aNode ) { - mWebShellWeakRef = getter_AddRefs(NS_GetWeakReference(aShell)); + mWebShellWeakRef = do_GetWeakReference(aShell); mMenuContent = aNode; // register this menu to be notified when changes are made to our content object diff --git a/mozilla/widget/src/mac/nsMenuBar.cpp b/mozilla/widget/src/mac/nsMenuBar.cpp index 842f8a88011..5d8e47892c8 100644 --- a/mozilla/widget/src/mac/nsMenuBar.cpp +++ b/mozilla/widget/src/mac/nsMenuBar.cpp @@ -127,7 +127,7 @@ nsMenuBar::nsMenuBar() ::ClearMenuBar(); mRefCnt = 1; // NS_GetWeakReference does an addref then a release, so this +1 is needed - gMacMenubar = getter_AddRefs(NS_GetWeakReference((nsIMenuBar *)this)); + gMacMenubar = do_GetWeakReference((nsIMenuBar *)this); mRefCnt = 0; // copy from nsMenu.cpp ScriptCode ps[1]; @@ -298,12 +298,12 @@ nsEventStatus nsMenuBar::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWindow, void * menubarNode, void * aWebShell ) { - mWebShellWeakRef = getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIWebShell*, aWebShell))); + mWebShellWeakRef = do_GetWeakReference(NS_STATIC_CAST(nsIWebShell*, aWebShell)); nsIDOMNode* aDOMNode = NS_STATIC_CAST(nsIDOMNode*, menubarNode); mMenuBarContent = do_QueryInterface(aDOMNode); // strong ref if(gFirstMenuBar) { - gOriginalMenuBar = getter_AddRefs(NS_GetWeakReference((nsIMenuBar *)this)); + gOriginalMenuBar = do_GetWeakReference((nsIMenuBar *)this); gFirstMenuBar = false; // Add the 4 Golden Hierarchical Menus to the MenuList @@ -579,7 +579,7 @@ NS_METHOD nsMenuBar::SetNativeData(void* aData) //------------------------------------------------------------------------- NS_METHOD nsMenuBar::Paint() { - gMacMenubar = getter_AddRefs(NS_GetWeakReference((nsIMenuBar *)this)); + gMacMenubar = do_GetWeakReference((nsIMenuBar *)this); ::SetMenuBar(mMacMBarHandle); // Now we have blown away the merged Help menu, so we have to rebuild it diff --git a/mozilla/widget/src/mac/nsMenuBarX.cpp b/mozilla/widget/src/mac/nsMenuBarX.cpp index 39123be392a..3e05a404ac7 100644 --- a/mozilla/widget/src/mac/nsMenuBarX.cpp +++ b/mozilla/widget/src/mac/nsMenuBarX.cpp @@ -450,7 +450,7 @@ nsEventStatus nsMenuBarX::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWindow, void * menubarNode, void * aWebShell ) { - mWebShellWeakRef = getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIWebShell*, aWebShell))); + mWebShellWeakRef = do_GetWeakReference(NS_STATIC_CAST(nsIWebShell*, aWebShell)); nsIDOMNode* aDOMNode = NS_STATIC_CAST(nsIDOMNode*, menubarNode); mMenuBarContent = do_QueryInterface(aDOMNode); // strong ref NS_ASSERTION ( mMenuBarContent, "No content specified for this menubar" ); diff --git a/mozilla/widget/src/mac/nsMenuItem.cpp b/mozilla/widget/src/mac/nsMenuItem.cpp index 541a41541c3..dc9f62ffe5b 100644 --- a/mozilla/widget/src/mac/nsMenuItem.cpp +++ b/mozilla/widget/src/mac/nsMenuItem.cpp @@ -100,7 +100,7 @@ NS_METHOD nsMenuItem::Create ( nsIMenu* aParent, const nsString & aLabel, PRBool { mContent = aNode; // addref mMenuParent = aParent; // weak - mWebShellWeakRef = getter_AddRefs(NS_GetWeakReference(aShell)); + mWebShellWeakRef = do_GetWeakReference(aShell); mEnabled = aEnabled; mMenuType = aItemType; diff --git a/mozilla/widget/src/mac/nsMenuItemX.cpp b/mozilla/widget/src/mac/nsMenuItemX.cpp index d77fbbb48f0..2d8492a7610 100644 --- a/mozilla/widget/src/mac/nsMenuItemX.cpp +++ b/mozilla/widget/src/mac/nsMenuItemX.cpp @@ -99,7 +99,7 @@ NS_METHOD nsMenuItemX::Create ( nsIMenu* aParent, const nsString & aLabel, PRBoo { mContent = aNode; // addref mMenuParent = aParent; // weak - mWebShellWeakRef = getter_AddRefs(NS_GetWeakReference(aShell)); + mWebShellWeakRef = do_GetWeakReference(aShell); mEnabled = aEnabled; mMenuType = aItemType; diff --git a/mozilla/widget/src/mac/nsMenuX.cpp b/mozilla/widget/src/mac/nsMenuX.cpp index de0a55f782b..18d02f47248 100644 --- a/mozilla/widget/src/mac/nsMenuX.cpp +++ b/mozilla/widget/src/mac/nsMenuX.cpp @@ -156,7 +156,7 @@ NS_METHOD nsMenuX::Create(nsISupports * aParent, const nsAString &aLabel, const nsAString &aAccessKey, nsIChangeManager* aManager, nsIWebShell* aShell, nsIContent* aNode ) { - mWebShellWeakRef = getter_AddRefs(NS_GetWeakReference(aShell)); + mWebShellWeakRef = do_GetWeakReference(aShell); mMenuContent = aNode; // register this menu to be notified when changes are made to our content object diff --git a/mozilla/widget/src/xlib/nsWindow.cpp b/mozilla/widget/src/xlib/nsWindow.cpp index b21848980a5..2559f3e0cfa 100644 --- a/mozilla/widget/src/xlib/nsWindow.cpp +++ b/mozilla/widget/src/xlib/nsWindow.cpp @@ -349,7 +349,7 @@ NS_IMETHODIMP nsWindow::CaptureRollupEvents(nsIRollupListener * aListener, gRollupConsumeRollupEvent = PR_TRUE; gRollupListener = aListener; - gRollupWidget = getter_AddRefs(NS_GetWeakReference(NS_STATIC_CAST(nsIWidget*, this))); + gRollupWidget = do_GetWeakReference(NS_STATIC_CAST(nsIWidget*, this)); }else{ // Release Grab if (sGrabWindow == this) diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index 967953fec94..822c4f81bc1 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -272,7 +272,7 @@ nsresult nsWebShellWindow::Initialize(nsIXULWindow* aParent, nsCOMPtr parentAsWin(do_QueryInterface(aParent)); if (parentAsWin) { parentAsWin->GetMainWidget(getter_AddRefs(parentWidget)); - mParentWindow = getter_AddRefs(NS_GetWeakReference(aParent)); + mParentWindow = do_GetWeakReference(aParent); } mWindow->SetClientData(this); diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index e4fffa9d799..04cdf7bb160 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp @@ -429,7 +429,7 @@ nsBrowserInstance::ReinitializeContentVariables() nsCOMPtr docShell; globalObj->GetDocShell(getter_AddRefs(docShell)); - mContentAreaDocShellWeak = dont_AddRef(NS_GetWeakReference(docShell)); // Weak reference + mContentAreaDocShellWeak = do_GetWeakReference(docShell); // Weak reference if (APP_DEBUG) { nsCOMPtr docShellAsItem(do_QueryInterface(docShell)); diff --git a/mozilla/xpfe/components/shistory/src/nsSHistory.cpp b/mozilla/xpfe/components/shistory/src/nsSHistory.cpp index ca39a22120e..e32673dc0b2 100644 --- a/mozilla/xpfe/components/shistory/src/nsSHistory.cpp +++ b/mozilla/xpfe/components/shistory/src/nsSHistory.cpp @@ -397,7 +397,7 @@ nsSHistory::AddSHistoryListener(nsISHistoryListener * aListener) // Check if the listener supports Weak Reference. This is a must. // This listener functionality is used by embedders and we want to // have the right ownership with who ever listens to SHistory - nsWeakPtr listener = getter_AddRefs(NS_GetWeakReference(aListener)); + nsWeakPtr listener = do_GetWeakReference(aListener); if (!listener) return NS_ERROR_FAILURE; mListener = listener; return NS_OK; @@ -409,7 +409,7 @@ nsSHistory::RemoveSHistoryListener(nsISHistoryListener * aListener) { // Make sure the listener that wants to be removed is the // one we have in store. - nsWeakPtr listener = getter_AddRefs(NS_GetWeakReference(aListener)); + nsWeakPtr listener = do_GetWeakReference(aListener); if (listener == mListener) { mListener = nsnull; return NS_OK;