From cd52437ea7c163ac3cd10188e1e596371d3365f7 Mon Sep 17 00:00:00 2001 From: Jonas Sicking Date: Thu, 23 Jun 2011 19:18:01 -0700 Subject: [PATCH] Bug 658714 Part 6: Fixups after search'n'replace s/nsPIDOMEventTarget/nsIDOMEventTarget/. r=smaug --- content/base/src/nsDocument.cpp | 14 +++++----- content/base/src/nsTextNode.cpp | 1 - content/base/src/nsTextNode.h | 1 - content/events/src/nsDOMEvent.cpp | 7 ++--- content/events/src/nsDOMEventTargetHelper.cpp | 10 +++---- content/events/src/nsDOMEventTargetHelper.h | 4 +-- content/events/src/nsEventDispatcher.cpp | 6 ++--- content/events/src/nsEventListenerService.cpp | 20 +++++--------- content/events/src/nsEventListenerService.h | 1 - content/events/src/nsEventStateManager.cpp | 1 - .../html/content/src/nsHTMLInputElement.cpp | 1 - .../html/content/src/nsHTMLLinkElement.cpp | 1 - content/smil/nsSMILTimeValueSpec.cpp | 10 +++---- content/xbl/src/nsXBLEventHandler.cpp | 6 ++--- content/xul/content/src/nsXULElement.cpp | 1 - content/xul/document/src/nsXULDocument.cpp | 6 ++--- docshell/base/nsDocShell.cpp | 7 ++--- dom/base/nsDOMClassInfo.cpp | 10 +++---- dom/base/nsGlobalWindow.cpp | 4 +-- dom/base/nsGlobalWindow.h | 1 - dom/base/nsWindowRoot.h | 1 - dom/src/threads/nsDOMWorkerXHRProxy.cpp | 1 - editor/libeditor/base/nsEditor.cpp | 7 ++--- editor/libeditor/base/nsEditor.h | 2 +- .../libeditor/base/nsEditorEventListener.cpp | 5 ++-- editor/libeditor/html/nsHTMLAbsPosition.cpp | 4 +-- editor/libeditor/html/nsHTMLEditor.cpp | 15 +++++------ editor/libeditor/html/nsHTMLEditor.h | 2 +- editor/libeditor/html/nsHTMLObjectResizer.cpp | 7 ++--- editor/libeditor/text/nsPlaintextEditor.cpp | 2 +- editor/libeditor/text/nsPlaintextEditor.h | 2 +- .../webBrowser/nsDocShellTreeOwner.cpp | 27 +++++++++---------- .../browser/webBrowser/nsDocShellTreeOwner.h | 1 - .../spellcheck/src/mozInlineSpellChecker.cpp | 1 - extensions/widgetutils/src/nsWidgetUtils.cpp | 27 +++++++++---------- layout/forms/nsListControlFrame.cpp | 1 - layout/xul/base/src/nsMenuBarListener.cpp | 1 - .../satchel/nsFormFillController.cpp | 12 +++------ 38 files changed, 90 insertions(+), 140 deletions(-) diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 4b5ee1957827..dd007d5ef0ef 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -7381,9 +7381,10 @@ nsDocument::OnPageShow(PRBool aPersisted, SetImagesNeedAnimating(PR_TRUE); } - nsCOMPtr target = - aDispatchStartTarget ? do_QueryInterface(aDispatchStartTarget) : - do_QueryInterface(GetWindow()); + nsCOMPtr target = aDispatchStartTarget; + if (!target) { + target = do_QueryInterface(GetWindow()); + } DispatchPageTransition(target, NS_LITERAL_STRING("pageshow"), aPersisted); } @@ -7434,9 +7435,10 @@ nsDocument::OnPageHide(PRBool aPersisted, } // Now send out a PageHide event. - nsCOMPtr target = - aDispatchStartTarget ? do_QueryInterface(aDispatchStartTarget) : - do_QueryInterface(GetWindow()); + nsCOMPtr target = aDispatchStartTarget; + if (!target) { + target = do_QueryInterface(GetWindow()); + } DispatchPageTransition(target, NS_LITERAL_STRING("pagehide"), aPersisted); mVisible = PR_FALSE; diff --git a/content/base/src/nsTextNode.cpp b/content/base/src/nsTextNode.cpp index ad5ac110db28..2757c0a1dfa0 100644 --- a/content/base/src/nsTextNode.cpp +++ b/content/base/src/nsTextNode.cpp @@ -42,7 +42,6 @@ #include "nsTextNode.h" #include "nsContentUtils.h" #include "nsIDOMEventListener.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMMutationEvent.h" #include "nsIAttribute.h" #include "nsIDocument.h" diff --git a/content/base/src/nsTextNode.h b/content/base/src/nsTextNode.h index 4dcfa243860f..5ce6a58bce7e 100644 --- a/content/base/src/nsTextNode.h +++ b/content/base/src/nsTextNode.h @@ -43,7 +43,6 @@ #include "nsIDOMText.h" #include "nsContentUtils.h" #include "nsIDOMEventListener.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMMutationEvent.h" #include "nsIAttribute.h" #include "nsIDocument.h" diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp index 4cdd31a1ec19..230e363deff5 100644 --- a/content/events/src/nsDOMEvent.cpp +++ b/content/events/src/nsDOMEvent.cpp @@ -46,7 +46,6 @@ #include "nsIContent.h" #include "nsIPresShell.h" #include "nsIDocument.h" -#include "nsIDOMEventTarget.h" #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" #include "prmem.h" @@ -285,11 +284,9 @@ GetDOMEventTarget(nsIDOMEventTarget* aTarget, { nsIDOMEventTarget* realTarget = aTarget ? aTarget->GetTargetForDOMEvent() : aTarget; - if (realTarget) { - return CallQueryInterface(realTarget, aDOMTarget); - } - *aDOMTarget = nsnull; + NS_IF_ADDREF(*aDOMTarget = realTarget); + return NS_OK; } diff --git a/content/events/src/nsDOMEventTargetHelper.cpp b/content/events/src/nsDOMEventTargetHelper.cpp index 2b9da84d4eb7..3bcd267b34c2 100644 --- a/content/events/src/nsDOMEventTargetHelper.cpp +++ b/content/events/src/nsDOMEventTargetHelper.cpp @@ -80,7 +80,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsDOMEventTargetHelper) NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventTargetHelper) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventTarget) + NS_INTERFACE_MAP_ENTRY(nsISupports) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) NS_INTERFACE_MAP_END @@ -140,8 +140,7 @@ nsDOMEventTargetHelper::DispatchEvent(nsIDOMEvent* aEvent, PRBool* aRetVal) { nsEventStatus status = nsEventStatus_eIgnore; nsresult rv = - nsEventDispatcher::DispatchDOMEvent(static_cast(this), - nsnull, aEvent, nsnull, &status); + nsEventDispatcher::DispatchDOMEvent(this, nsnull, aEvent, nsnull, &status); *aRetVal = (status != nsEventStatus_eConsumeNoDefault); return rv; @@ -199,8 +198,7 @@ nsDOMEventTargetHelper::DispatchDOMEvent(nsEvent* aEvent, nsEventStatus* aEventStatus) { return - nsEventDispatcher::DispatchDOMEvent(static_cast(this), - aEvent, aDOMEvent, aPresContext, + nsEventDispatcher::DispatchDOMEvent(this, aEvent, aDOMEvent, aPresContext, aEventStatus); } @@ -213,7 +211,7 @@ nsDOMEventTargetHelper::GetListenerManager(PRBool aCreateIfNotFound) } nsresult rv = NS_NewEventListenerManager(getter_AddRefs(mListenerManager)); NS_ENSURE_SUCCESS(rv, nsnull); - mListenerManager->SetListenerTarget(static_cast(this)); + mListenerManager->SetListenerTarget(this); } return mListenerManager; diff --git a/content/events/src/nsDOMEventTargetHelper.h b/content/events/src/nsDOMEventTargetHelper.h index 52a765c9db54..4cc6fdced2af 100644 --- a/content/events/src/nsDOMEventTargetHelper.h +++ b/content/events/src/nsDOMEventTargetHelper.h @@ -43,7 +43,6 @@ #include "nsAutoPtr.h" #include "nsIDOMEventTarget.h" #include "nsIDOMEventListener.h" -#include "nsIDOMEventTarget.h" #include "nsCycleCollectionParticipant.h" #include "nsPIDOMWindow.h" #include "nsIScriptGlobalObject.h" @@ -72,8 +71,7 @@ public: nsDOMEventTargetHelper() {} virtual ~nsDOMEventTargetHelper() {} NS_DECL_CYCLE_COLLECTING_ISUPPORTS - NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsDOMEventTargetHelper, - nsIDOMEventTarget) + NS_DECL_CYCLE_COLLECTION_CLASS(nsDOMEventTargetHelper) NS_DECL_NSIDOMEVENTTARGET diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp index 1d553c912357..274eb53ea2d7 100644 --- a/content/events/src/nsEventDispatcher.cpp +++ b/content/events/src/nsEventDispatcher.cpp @@ -232,7 +232,7 @@ public: sMaxEtciCount = 0; } - nsCOMPtr mTarget; + nsCOMPtr mTarget; nsEventTargetChainItem* mChild; union { nsEventTargetChainItem* mParent; @@ -243,7 +243,7 @@ public: PRUint16 mItemFlags; nsCOMPtr mItemData; // Event retargeting must happen whenever mNewTarget is non-null. - nsCOMPtr mNewTarget; + nsCOMPtr mNewTarget; // Cache mTarget's event listener manager. nsRefPtr mManager; @@ -619,7 +619,7 @@ nsEventDispatcher::Dispatch(nsISupports* aTarget, if (preVisitor.mCanHandle) { // At least the original target can handle the event. // Setting the retarget to the |target| simplifies retargeting code. - nsCOMPtr t = do_QueryInterface(aEvent->target); + nsCOMPtr t = aEvent->target; targetEtci->SetNewTarget(t); nsEventTargetChainItem* topEtci = targetEtci; while (preVisitor.mParentTarget) { diff --git a/content/events/src/nsEventListenerService.cpp b/content/events/src/nsEventListenerService.cpp index 0b4dc08a4d86..27a5dc7d8ae3 100644 --- a/content/events/src/nsEventListenerService.cpp +++ b/content/events/src/nsEventListenerService.cpp @@ -37,7 +37,6 @@ #include "nsEventListenerService.h" #include "nsCOMArray.h" #include "nsEventListenerManager.h" -#include "nsIDOMEventTarget.h" #include "nsIVariant.h" #include "nsIServiceManager.h" #include "nsMemory.h" @@ -202,13 +201,10 @@ nsEventListenerService::GetListenerInfoFor(nsIDOMEventTarget* aEventTarget, *aCount = 0; *aOutArray = nsnull; nsCOMArray listenerInfos; - nsCOMPtr target = do_QueryInterface(aEventTarget); - if (target) { - nsCOMPtr elm = - target->GetListenerManager(PR_FALSE); - if (elm) { - elm->GetListenerInfo(&listenerInfos); - } + nsIEventListenerManager* elm = + aEventTarget->GetListenerManager(PR_FALSE); + if (elm) { + elm->GetListenerInfo(&listenerInfos); } PRInt32 count = listenerInfos.Count(); @@ -235,11 +231,10 @@ nsEventListenerService::GetEventTargetChainFor(nsIDOMEventTarget* aEventTarget, { *aCount = 0; *aOutArray = nsnull; - nsCOMPtr target = do_QueryInterface(aEventTarget); - NS_ENSURE_ARG(target); + NS_ENSURE_ARG(aEventTarget); nsEvent event(PR_TRUE, NS_EVENT_TYPE_NULL); nsCOMArray targets; - nsresult rv = nsEventDispatcher::Dispatch(target, nsnull, &event, + nsresult rv = nsEventDispatcher::Dispatch(aEventTarget, nsnull, &event, nsnull, nsnull, nsnull, &targets); NS_ENSURE_SUCCESS(rv, rv); PRInt32 count = targets.Count(); @@ -253,8 +248,7 @@ nsEventListenerService::GetEventTargetChainFor(nsIDOMEventTarget* aEventTarget, NS_ENSURE_TRUE(*aOutArray, NS_ERROR_OUT_OF_MEMORY); for (PRInt32 i = 0; i < count; ++i) { - nsCOMPtr target = do_QueryInterface(targets[i]); - (*aOutArray)[i] = target.forget().get(); + NS_ADDREF((*aOutArray)[i] = targets[i]); } *aCount = count; diff --git a/content/events/src/nsEventListenerService.h b/content/events/src/nsEventListenerService.h index 9bd0d0676818..d0378ddc7ffb 100644 --- a/content/events/src/nsEventListenerService.h +++ b/content/events/src/nsEventListenerService.h @@ -42,7 +42,6 @@ #include "nsIDOMEventListener.h" #include "nsIDOMEventTarget.h" #include "nsString.h" -#include "nsIDOMEventTarget.h" #include "nsCycleCollectionParticipant.h" #include "jsapi.h" diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 6beaff861362..4447aa8d8893 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -88,7 +88,6 @@ #include "nsIDOMWindowInternal.h" #include "nsPIDOMWindow.h" #include "nsPIWindowRoot.h" -#include "nsIDOMEventTarget.h" #include "nsIEnumerator.h" #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeNode.h" diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp index 1fd18fa96630..f19af3d8ba07 100644 --- a/content/html/content/src/nsHTMLInputElement.cpp +++ b/content/html/content/src/nsHTMLInputElement.cpp @@ -49,7 +49,6 @@ #include "nsContentCID.h" #include "nsIComponentManager.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventTarget.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" #include "nsPresContext.h" diff --git a/content/html/content/src/nsHTMLLinkElement.cpp b/content/html/content/src/nsHTMLLinkElement.cpp index 8944fb926637..e12bd3dc717c 100644 --- a/content/html/content/src/nsHTMLLinkElement.cpp +++ b/content/html/content/src/nsHTMLLinkElement.cpp @@ -36,7 +36,6 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLLinkElement.h" #include "nsIDOMLinkStyle.h" -#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsILink.h" #include "nsGkAtoms.h" diff --git a/content/smil/nsSMILTimeValueSpec.cpp b/content/smil/nsSMILTimeValueSpec.cpp index cc4c8eae7b4c..922d9de7141f 100644 --- a/content/smil/nsSMILTimeValueSpec.cpp +++ b/content/smil/nsSMILTimeValueSpec.cpp @@ -377,7 +377,7 @@ nsSMILTimeValueSpec::GetEventListenerManager(Element* aTarget, NS_ABORT_IF_FALSE(aSystemGroup && !*aSystemGroup, "Bad out param for system group"); - nsCOMPtr piTarget; + nsCOMPtr target; if (mParams.mType == nsSMILTimeValueSpecParams::ACCESSKEY) { nsIDocument* doc = aTarget->GetCurrentDoc(); @@ -386,14 +386,14 @@ nsSMILTimeValueSpec::GetEventListenerManager(Element* aTarget, nsPIDOMWindow* win = doc->GetWindow(); if (!win) return nsnull; - piTarget = do_QueryInterface(win); + target = do_QueryInterface(win); } else { - piTarget = aTarget; + target = aTarget; } - if (!piTarget) + if (!target) return nsnull; - nsIEventListenerManager* elm = piTarget->GetListenerManager(PR_TRUE); + nsIEventListenerManager* elm = target->GetListenerManager(PR_TRUE); if (!elm) return nsnull; diff --git a/content/xbl/src/nsXBLEventHandler.cpp b/content/xbl/src/nsXBLEventHandler.cpp index 2337178d956b..08b46826b52e 100644 --- a/content/xbl/src/nsXBLEventHandler.cpp +++ b/content/xbl/src/nsXBLEventHandler.cpp @@ -83,9 +83,8 @@ nsXBLEventHandler::HandleEvent(nsIDOMEvent* aEvent) nsCOMPtr target; aEvent->GetCurrentTarget(getter_AddRefs(target)); - nsCOMPtr piTarget = do_QueryInterface(target); - mProtoHandler->ExecuteHandler(piTarget, aEvent); + mProtoHandler->ExecuteHandler(target, aEvent); return NS_OK; } @@ -133,7 +132,6 @@ nsXBLKeyEventHandler::ExecuteMatchedHandlers(nsIDOMKeyEvent* aKeyEvent, nsCOMPtr target; aKeyEvent->GetCurrentTarget(getter_AddRefs(target)); - nsCOMPtr piTarget = do_QueryInterface(target); PRBool executed = PR_FALSE; for (PRUint32 i = 0; i < mProtoHandlers.Length(); ++i) { @@ -143,7 +141,7 @@ nsXBLKeyEventHandler::ExecuteMatchedHandlers(nsIDOMKeyEvent* aKeyEvent, (hasAllowUntrustedAttr && handler->AllowUntrustedEvents()) || (!hasAllowUntrustedAttr && !mIsBoundToChrome)) && handler->KeyEventMatched(aKeyEvent, aCharCode, aIgnoreShiftKey)) { - handler->ExecuteHandler(piTarget, aKeyEvent); + handler->ExecuteHandler(target, aKeyEvent); executed = PR_TRUE; } } diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index f6e592097d68..f1ba8903d3c8 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -74,7 +74,6 @@ #include "nsIDOMFormListener.h" #include "nsIDOMContextMenuListener.h" #include "nsIDOMEventListener.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMNodeList.h" #include "nsIDOMXULCommandDispatcher.h" #include "nsIDOMXULElement.h" diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index efc4182c2b23..ee187c44d436 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -1717,8 +1717,7 @@ nsXULDocument::AddElementToDocumentPost(Element* aElement) // Create our XUL key listener and hook it up. nsCOMPtr xblService(do_GetService("@mozilla.org/xbl;1")); if (xblService) { - nsCOMPtr piTarget(do_QueryInterface(aElement)); - xblService->AttachGlobalKeyHandler(piTarget); + xblService->AttachGlobalKeyHandler(aElement); } } @@ -1793,8 +1792,7 @@ nsXULDocument::RemoveSubtreeFromDocument(nsIContent* aContent) if (aElement->NodeInfo()->Equals(nsGkAtoms::keyset, kNameSpaceID_XUL)) { nsCOMPtr xblService(do_GetService("@mozilla.org/xbl;1")); if (xblService) { - nsCOMPtr piTarget(do_QueryInterface(aElement)); - xblService->DetachGlobalKeyHandler(piTarget); + xblService->DetachGlobalKeyHandler(aElement); } } diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 7e5f04b9498a..968d6bedf88f 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -70,7 +70,6 @@ #include "nsIMarkupDocumentViewer.h" #include "nsXPIDLString.h" #include "nsReadableUtils.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMChromeWindow.h" #include "nsIDOMWindowInternal.h" #include "nsIWebBrowserChrome.h" @@ -1773,14 +1772,12 @@ nsDocShell::GetContentViewer(nsIContentViewer ** aContentViewer) NS_IMETHODIMP nsDocShell::SetChromeEventHandler(nsIDOMEventTarget* aChromeEventHandler) { - nsCOMPtr piTarget = - do_QueryInterface(aChromeEventHandler); // Weak reference. Don't addref. - mChromeEventHandler = piTarget; + mChromeEventHandler = aChromeEventHandler; nsCOMPtr win(do_QueryInterface(mScriptGlobal)); if (win) { - win->SetChromeEventHandler(piTarget); + win->SetChromeEventHandler(aChromeEventHandler); } return NS_OK; diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index b2bcd2536231..be0f2301e2b1 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -7749,15 +7749,15 @@ nsEventReceiverSH::RegisterCompileHandler(nsIXPConnectWrappedNative *wrapper, nsIScriptContext *script_cx = nsJSUtils::GetStaticScriptContext(cx, obj); NS_ENSURE_TRUE(script_cx, NS_ERROR_UNEXPECTED); - nsCOMPtr piTarget = + nsCOMPtr target = do_QueryWrappedNative(wrapper, obj); - if (!piTarget) { + if (!target) { // Doesn't do events NS_WARNING("Doesn't QI to nsIDOMEventTarget?"); return NS_OK; } - nsIEventListenerManager* manager = piTarget->GetListenerManager(PR_TRUE); + nsIEventListenerManager* manager = target->GetListenerManager(PR_TRUE); NS_ENSURE_TRUE(manager, NS_ERROR_UNEXPECTED); nsCOMPtr atom(do_GetAtom(nsDependentJSString(id))); @@ -7768,12 +7768,12 @@ nsEventReceiverSH::RegisterCompileHandler(nsIXPConnectWrappedNative *wrapper, JSObject *scope = ::JS_GetGlobalForObject(cx, obj); if (compile) { - rv = manager->CompileScriptEventListener(script_cx, scope, piTarget, atom, + rv = manager->CompileScriptEventListener(script_cx, scope, target, atom, did_define); } else if (remove) { rv = manager->RemoveScriptEventListener(atom); } else { - rv = manager->RegisterScriptEventListener(script_cx, scope, piTarget, + rv = manager->RegisterScriptEventListener(script_cx, scope, target, atom); } diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 1815fe140b70..40b4a39ef62e 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -1851,9 +1851,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, if (internal == static_cast(this)) { nsCOMPtr xblService = do_GetService("@mozilla.org/xbl;1"); if (xblService) { - nsCOMPtr piTarget = - do_QueryInterface(mChromeEventHandler); - xblService->AttachGlobalKeyHandler(piTarget); + xblService->AttachGlobalKeyHandler(mChromeEventHandler); } } } diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index 15a263b27895..cf05a0247e74 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -102,7 +102,6 @@ #include "nsIDOMStorageEvent.h" #include "nsIDOMStorageIndexedDB.h" #include "nsIDOMOfflineResourceList.h" -#include "nsIDOMEventTarget.h" #include "nsIArray.h" #include "nsIContent.h" #include "nsIIDBFactory.h" diff --git a/dom/base/nsWindowRoot.h b/dom/base/nsWindowRoot.h index 9f0cbdb92abc..3747fbfb5f9b 100644 --- a/dom/base/nsWindowRoot.h +++ b/dom/base/nsWindowRoot.h @@ -51,7 +51,6 @@ class nsEventChainPostVisitor; #include "nsIDOM3EventTarget.h" #include "nsIEventListenerManager.h" #include "nsPIWindowRoot.h" -#include "nsIDOMEventTarget.h" #include "nsCycleCollectionParticipant.h" class nsWindowRoot : public nsIDOM3EventTarget, diff --git a/dom/src/threads/nsDOMWorkerXHRProxy.cpp b/dom/src/threads/nsDOMWorkerXHRProxy.cpp index 6d210b4405ca..87506f563a3c 100644 --- a/dom/src/threads/nsDOMWorkerXHRProxy.cpp +++ b/dom/src/threads/nsDOMWorkerXHRProxy.cpp @@ -40,7 +40,6 @@ // Interfaces #include "nsIDOMEvent.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMProgressEvent.h" #include "nsILoadGroup.h" #include "nsIRequest.h" diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp index 8c53babea804..8669a59c05c9 100644 --- a/editor/libeditor/base/nsEditor.cpp +++ b/editor/libeditor/base/nsEditor.cpp @@ -43,9 +43,7 @@ #include "nsIDOMDocument.h" #include "nsIDOMHTMLElement.h" #include "nsIDOMNSHTMLElement.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMNSEvent.h" -#include "nsIDOMEventTarget.h" #include "nsIMEStateManager.h" #include "nsFocusManager.h" #include "nsUnicharUtils.h" @@ -60,7 +58,6 @@ #include "nsIDOMNodeList.h" #include "nsIDOMRange.h" #include "nsIDOMHTMLBRElement.h" -#include "nsIDOMEventTarget.h" #include "nsIDocument.h" #include "nsITransactionManager.h" #include "nsIAbsorbingTransaction.h" @@ -5237,7 +5234,7 @@ nsEditor::GetNativeKeyEvent(nsIDOMKeyEvent* aDOMKeyEvent) already_AddRefed nsEditor::GetFocusedContent() { - nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr piTarget = GetDOMEventTarget(); if (!piTarget) { return nsnull; } @@ -5252,7 +5249,7 @@ nsEditor::GetFocusedContent() PRBool nsEditor::IsActiveInDOMWindow() { - nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr piTarget = GetDOMEventTarget(); if (!piTarget) { return PR_FALSE; } diff --git a/editor/libeditor/base/nsEditor.h b/editor/libeditor/base/nsEditor.h index ac547882916d..7e3161853fcc 100644 --- a/editor/libeditor/base/nsEditor.h +++ b/editor/libeditor/base/nsEditor.h @@ -613,7 +613,7 @@ public: nsIDOMNode *aEndNode, PRInt32 aEndOffset); - virtual already_AddRefed GetPIDOMEventTarget() = 0; + virtual already_AddRefed GetDOMEventTarget() = 0; // Fast non-refcounting editor root element accessor nsIDOMElement *GetRoot(); diff --git a/editor/libeditor/base/nsEditorEventListener.cpp b/editor/libeditor/base/nsEditorEventListener.cpp index 5175604ca2be..4b6e4bb51958 100644 --- a/editor/libeditor/base/nsEditorEventListener.cpp +++ b/editor/libeditor/base/nsEditorEventListener.cpp @@ -69,7 +69,6 @@ #include "nsISupportsPrimitives.h" #include "nsIDOMNSRange.h" #include "nsEditorUtils.h" -#include "nsIDOMEventTarget.h" #include "nsISelectionPrivate.h" #include "nsIDOMDragEvent.h" #include "nsIFocusManager.h" @@ -125,7 +124,7 @@ nsEditorEventListener::InstallToEditor() { NS_PRECONDITION(mEditor, "The caller must set mEditor"); - nsCOMPtr piTarget = mEditor->GetPIDOMEventTarget(); + nsCOMPtr piTarget = mEditor->GetDOMEventTarget(); NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE); nsresult rv; @@ -204,7 +203,7 @@ nsEditorEventListener::Disconnect() void nsEditorEventListener::UninstallFromEditor() { - nsCOMPtr piTarget = mEditor->GetPIDOMEventTarget(); + nsCOMPtr piTarget = mEditor->GetDOMEventTarget(); if (!piTarget) { return; } diff --git a/editor/libeditor/html/nsHTMLAbsPosition.cpp b/editor/libeditor/html/nsHTMLAbsPosition.cpp index 0cb7d17f4ded..9dd6648ee3d6 100644 --- a/editor/libeditor/html/nsHTMLAbsPosition.cpp +++ b/editor/libeditor/html/nsHTMLAbsPosition.cpp @@ -411,7 +411,7 @@ nsHTMLEditor::GrabberClicked() mMouseMotionListenerP = new ResizerMouseMotionListener(this); if (!mMouseMotionListenerP) {return NS_ERROR_NULL_POINTER;} - nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr piTarget = GetDOMEventTarget(); NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE); res = piTarget->AddEventListenerByIID(mMouseMotionListenerP, @@ -441,7 +441,7 @@ nsHTMLEditor::EndMoving() mPositioningShadow = nsnull; } - nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr piTarget = GetDOMEventTarget(); if (piTarget && mMouseMotionListenerP) { #ifdef DEBUG diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp index c3166b7b6d22..0a16671b164c 100644 --- a/editor/libeditor/html/nsHTMLEditor.cpp +++ b/editor/libeditor/html/nsHTMLEditor.cpp @@ -473,10 +473,9 @@ nsHTMLEditor::RemoveEventListeners() return; } - nsCOMPtr piTarget = GetPIDOMEventTarget(); - nsCOMPtr target = do_QueryInterface(piTarget); + nsCOMPtr target = GetDOMEventTarget(); - if (piTarget && target) + if (target) { // Both mMouseMotionListenerP and mResizeEventListenerP can be // registerd with other targets than the DOM event receiver that @@ -489,8 +488,8 @@ nsHTMLEditor::RemoveEventListeners() { // mMouseMotionListenerP might be registerd either by IID or // name, unregister by both. - piTarget->RemoveEventListenerByIID(mMouseMotionListenerP, - NS_GET_IID(nsIDOMMouseMotionListener)); + target->RemoveEventListenerByIID(mMouseMotionListenerP, + NS_GET_IID(nsIDOMMouseMotionListener)); target->RemoveEventListener(NS_LITERAL_STRING("mousemove"), mMouseMotionListenerP, PR_TRUE); @@ -5827,14 +5826,14 @@ nsHTMLEditor::IsActiveInDOMWindow() } already_AddRefed -nsHTMLEditor::GetPIDOMEventTarget() +nsHTMLEditor::GetDOMEventTarget() { // Don't use getDocument here, because we have no way of knowing // whether Init() was ever called. So we need to get the document // ourselves, if it exists. NS_PRECONDITION(mDocWeak, "This editor has not been initialized yet"); - nsCOMPtr piTarget = do_QueryReferent(mDocWeak.get()); - return piTarget.forget(); + nsCOMPtr target = do_QueryReferent(mDocWeak.get()); + return target.forget(); } PRBool diff --git a/editor/libeditor/html/nsHTMLEditor.h b/editor/libeditor/html/nsHTMLEditor.h index 4ae9c00b9841..7f1f6c5798ab 100644 --- a/editor/libeditor/html/nsHTMLEditor.h +++ b/editor/libeditor/html/nsHTMLEditor.h @@ -151,7 +151,7 @@ public: virtual nsresult HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent); virtual already_AddRefed GetFocusedContent(); virtual PRBool IsActiveInDOMWindow(); - virtual already_AddRefed GetPIDOMEventTarget(); + virtual already_AddRefed GetDOMEventTarget(); virtual already_AddRefed FindSelectionRoot(nsINode *aNode); virtual PRBool IsAcceptableInputEvent(nsIDOMEvent* aEvent); diff --git a/editor/libeditor/html/nsHTMLObjectResizer.cpp b/editor/libeditor/html/nsHTMLObjectResizer.cpp index aafa8779a737..e603f2083c9b 100644 --- a/editor/libeditor/html/nsHTMLObjectResizer.cpp +++ b/editor/libeditor/html/nsHTMLObjectResizer.cpp @@ -38,7 +38,6 @@ #include "nsHTMLObjectResizer.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMNSHTMLElement.h" #include "nsIDOMEventTarget.h" #include "nsIDOMText.h" @@ -497,8 +496,7 @@ nsHTMLEditor::HideResizers(void) // don't forget to remove the listeners ! - nsCOMPtr piTarget = GetPIDOMEventTarget(); - nsCOMPtr target = do_QueryInterface(piTarget); + nsCOMPtr target = GetDOMEventTarget(); if (target && mMouseMotionListenerP) { @@ -606,8 +604,7 @@ nsHTMLEditor::StartResizing(nsIDOMElement *aHandle) return NS_ERROR_OUT_OF_MEMORY; } - nsCOMPtr piTarget = GetPIDOMEventTarget(); - nsCOMPtr target = do_QueryInterface(piTarget); + nsCOMPtr target = GetDOMEventTarget(); NS_ENSURE_TRUE(target, NS_ERROR_FAILURE); result = target->AddEventListener(NS_LITERAL_STRING("mousemove"), diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/text/nsPlaintextEditor.cpp index ee06c7648847..7fdecc8b1edb 100644 --- a/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/editor/libeditor/text/nsPlaintextEditor.cpp @@ -1716,7 +1716,7 @@ nsPlaintextEditor::SelectEntireDocument(nsISelection *aSelection) } already_AddRefed -nsPlaintextEditor::GetPIDOMEventTarget() +nsPlaintextEditor::GetDOMEventTarget() { NS_IF_ADDREF(mEventTarget); return mEventTarget.get(); diff --git a/editor/libeditor/text/nsPlaintextEditor.h b/editor/libeditor/text/nsPlaintextEditor.h index fc979704ab8c..b2ada597934f 100644 --- a/editor/libeditor/text/nsPlaintextEditor.h +++ b/editor/libeditor/text/nsPlaintextEditor.h @@ -145,7 +145,7 @@ public: virtual nsresult HandleKeyPressEvent(nsIDOMKeyEvent* aKeyEvent); - virtual already_AddRefed GetPIDOMEventTarget(); + virtual already_AddRefed GetDOMEventTarget(); virtual nsresult BeginIMEComposition(); virtual nsresult UpdateIMEComposition(const nsAString &aCompositionString, diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index dd946e94d880..0cbc7db9f4aa 100644 --- a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -74,7 +74,6 @@ #include "nsIDOMEvent.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMNSUIEvent.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMNamedNodeMap.h" #include "nsIFormControl.h" #include "nsIDOMHTMLInputElement.h" @@ -102,7 +101,6 @@ #include "nsPresContext.h" #include "nsIViewManager.h" #include "nsIView.h" -#include "nsIDOMEventTarget.h" #include "nsIEventListenerManager.h" #include "nsIDOMEventGroup.h" #include "nsIDOMDragEvent.h" @@ -115,7 +113,7 @@ // a |nsIDOMEventTarget| via the window root and chrome event handler. // static nsresult -GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsIDOMEventTarget** aTarget) +GetDOMEventTarget( nsWebBrowser* inBrowser, nsIDOMEventTarget** aTarget) { NS_ENSURE_ARG_POINTER(inBrowser); @@ -127,11 +125,10 @@ GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsIDOMEventTarget** aTarget) NS_ENSURE_TRUE(domWindowPrivate, NS_ERROR_FAILURE); nsPIDOMWindow *rootWindow = domWindowPrivate->GetPrivateRoot(); NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE); - nsCOMPtr piTarget = - do_QueryInterface(rootWindow->GetChromeEventHandler()); - NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE); - *aTarget = piTarget; - NS_IF_ADDREF(*aTarget); + nsCOMPtr target = + rootWindow->GetChromeEventHandler(); + NS_ENSURE_TRUE(target, NS_ERROR_FAILURE); + target.forget(aTarget); return NS_OK; } @@ -888,12 +885,12 @@ nsDocShellTreeOwner::AddChromeListeners() } // register dragover and drop event listeners with the listener manager - nsCOMPtr piTarget; - GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget)); + nsCOMPtr target; + GetDOMEventTarget(mWebBrowser, getter_AddRefs(target)); nsCOMPtr sysGroup; - piTarget->GetSystemEventGroup(getter_AddRefs(sysGroup)); - nsIEventListenerManager* elmP = piTarget->GetListenerManager(PR_TRUE); + target->GetSystemEventGroup(getter_AddRefs(sysGroup)); + nsIEventListenerManager* elmP = target->GetListenerManager(PR_TRUE); if (sysGroup && elmP) { rv = elmP->AddEventListenerByType(this, NS_LITERAL_STRING("dragover"), @@ -923,7 +920,7 @@ nsDocShellTreeOwner::RemoveChromeListeners() } nsCOMPtr piTarget; - GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget)); + GetDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget)); if (!piTarget) return NS_OK; @@ -1246,7 +1243,7 @@ NS_IMETHODIMP ChromeTooltipListener::AddChromeListeners() { if (!mEventTarget) - GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget)); + GetDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget)); // Register the appropriate events for tooltips, but only if // the embedding chrome cares. @@ -1729,7 +1726,7 @@ NS_IMETHODIMP ChromeContextMenuListener::AddChromeListeners() { if (!mEventTarget) - GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget)); + GetDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget)); // Register the appropriate events for context menus, but only if // the embedding chrome cares. diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.h b/embedding/browser/webBrowser/nsDocShellTreeOwner.h index c6bf94fe0820..a9ee4c07eebf 100644 --- a/embedding/browser/webBrowser/nsDocShellTreeOwner.h +++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.h @@ -52,7 +52,6 @@ #include "nsIWebBrowserChrome.h" #include "nsIDOMMouseListener.h" #include "nsIDOMDocument.h" -#include "nsIDOMEventTarget.h" #include "nsIEmbeddingSiteWindow.h" #include "nsIWebProgressListener.h" #include "nsWeakReference.h" diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp index 82ad0de63c88..227f3f47cbe0 100644 --- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp +++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp @@ -73,7 +73,6 @@ #include "nsIDOMDocument.h" #include "nsIDOMElement.h" #include "nsIDOMEventTarget.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMNode.h" diff --git a/extensions/widgetutils/src/nsWidgetUtils.cpp b/extensions/widgetutils/src/nsWidgetUtils.cpp index 8e1c22104a40..aae12e98d80f 100644 --- a/extensions/widgetutils/src/nsWidgetUtils.cpp +++ b/extensions/widgetutils/src/nsWidgetUtils.cpp @@ -450,10 +450,7 @@ nsWidgetUtils::GetChromeEventHandler(nsIDOMWindow *aDOMWin, chromeEventHandler = privateDOMWindow->GetChromeEventHandler(); } - nsCOMPtr target(do_QueryInterface(chromeEventHandler)); - - *aChromeTarget = target; - NS_IF_ADDREF(*aChromeTarget); + NS_IF_ADDREF(*aChromeTarget = chromeEventHandler); } void @@ -467,17 +464,18 @@ nsWidgetUtils::RemoveWindowListeners(nsIDOMWindow *aDOMWin) } // Use capturing, otherwise the normal find next will get activated when ours should - nsCOMPtr piTarget(do_QueryInterface(chromeEventHandler)); // Remove DOM Text listener for IME text events - rv = piTarget->RemoveEventListenerByIID(static_cast(this), - NS_GET_IID(nsIDOMMouseListener)); + rv = chromeEventHandler-> + RemoveEventListenerByIID(static_cast(this), + NS_GET_IID(nsIDOMMouseListener)); if (NS_FAILED(rv)) { NS_WARNING("Failed to add Mouse Motion listener\n"); return; } - rv = piTarget->RemoveEventListenerByIID(static_cast(this), - NS_GET_IID(nsIDOMMouseMotionListener)); + rv = chromeEventHandler-> + RemoveEventListenerByIID(static_cast(this), + NS_GET_IID(nsIDOMMouseMotionListener)); if (NS_FAILED(rv)) { NS_WARNING("Failed to add Mouse Motion listener\n"); return; @@ -495,17 +493,18 @@ nsWidgetUtils::AttachWindowListeners(nsIDOMWindow *aDOMWin) } // Use capturing, otherwise the normal find next will get activated when ours should - nsCOMPtr piTarget(do_QueryInterface(chromeEventHandler)); // Attach menu listeners, this will help us ignore keystrokes meant for menus - rv = piTarget->AddEventListenerByIID(static_cast(this), - NS_GET_IID(nsIDOMMouseListener)); + rv = chromeEventHandler-> + AddEventListenerByIID(static_cast(this), + NS_GET_IID(nsIDOMMouseListener)); if (NS_FAILED(rv)) { NS_WARNING("Failed to add Mouse Motion listener\n"); return; } - rv = piTarget->AddEventListenerByIID(static_cast(this), - NS_GET_IID(nsIDOMMouseMotionListener)); + rv = chromeEventHandler-> + AddEventListenerByIID(static_cast(this), + NS_GET_IID(nsIDOMMouseMotionListener)); if (NS_FAILED(rv)) { NS_WARNING("Failed to add Mouse Motion listener\n"); return; diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 883ee8379313..2009f89f507c 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -70,7 +70,6 @@ #include "nsILookAndFeel.h" #include "nsFontMetrics.h" #include "nsIScrollableFrame.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMNSEvent.h" #include "nsGUIEvent.h" #include "nsIServiceManager.h" diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp index 2a080a215da7..1c9495e3d306 100644 --- a/layout/xul/base/src/nsMenuBarListener.cpp +++ b/layout/xul/base/src/nsMenuBarListener.cpp @@ -42,7 +42,6 @@ #include "nsMenuBarFrame.h" #include "nsMenuPopupFrame.h" #include "nsIDOMKeyListener.h" -#include "nsIDOMEventTarget.h" #include "nsIDOMEventListener.h" #include "nsIDOMNSUIEvent.h" #include "nsIDOMNSEvent.h" diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/toolkit/components/satchel/nsFormFillController.cpp index f09345cbe6c0..ea345d647ecf 100644 --- a/toolkit/components/satchel/nsFormFillController.cpp +++ b/toolkit/components/satchel/nsFormFillController.cpp @@ -1123,11 +1123,9 @@ nsFormFillController::AddWindowListeners(nsIDOMWindow *aWindow) return; nsCOMPtr privateDOMWindow(do_QueryInterface(aWindow)); - nsIDOMEventTarget* chromeEventHandler = nsnull; + nsIDOMEventTarget* target = nsnull; if (privateDOMWindow) - chromeEventHandler = privateDOMWindow->GetChromeEventHandler(); - - nsCOMPtr target(do_QueryInterface(chromeEventHandler)); + target = privateDOMWindow->GetChromeEventHandler(); if (!target) return; @@ -1185,12 +1183,10 @@ nsFormFillController::RemoveWindowListeners(nsIDOMWindow *aWindow) mPwmgrInputs.Enumerate(RemoveForDOMDocumentEnumerator, domDoc); nsCOMPtr privateDOMWindow(do_QueryInterface(aWindow)); - nsIDOMEventTarget* chromeEventHandler = nsnull; + nsIDOMEventTarget* target = nsnull; if (privateDOMWindow) - chromeEventHandler = privateDOMWindow->GetChromeEventHandler(); + target = privateDOMWindow->GetChromeEventHandler(); - nsCOMPtr target(do_QueryInterface(chromeEventHandler)); - if (!target) return;