diff --git a/content/base/src/nsContentAreaDragDrop.cpp b/content/base/src/nsContentAreaDragDrop.cpp index 467b95b7610e..7fc1bce2991e 100644 --- a/content/base/src/nsContentAreaDragDrop.cpp +++ b/content/base/src/nsContentAreaDragDrop.cpp @@ -50,6 +50,7 @@ #include "nsISelection.h" #include "nsIDOMNode.h" #include "nsIDOMNodeList.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMEvent.h" #include "nsIDOMNSEvent.h" #include "nsIDOMMouseEvent.h" @@ -97,7 +98,6 @@ #include "nsContentCID.h" #include "nsISelectionController.h" #include "nsFrameSelection.h" -#include "nsIDOMEventTarget.h" // private clipboard data flavors for html copy, used by editor when pasting #define kHTMLContext "text/_moz_htmlcontext" @@ -190,9 +190,9 @@ nsContentAreaDragDrop::HookupTo(nsIDOMEventTarget *inAttachPoint, nsIWebNavigation* inNavigator) { NS_ASSERTION(inAttachPoint, "Can't hookup Drag Listeners to NULL receiver"); - mEventTarget = do_QueryInterface(inAttachPoint); - NS_ASSERTION(mEventTarget, - "Target doesn't implement nsPIDOMEventTarget as needed"); + mEventReceiver = do_QueryInterface(inAttachPoint); + NS_ASSERTION(mEventReceiver, + "Target doesn't implement nsIDOMEventReceiver as needed"); mNavigator = inNavigator; return AddDragListener(); @@ -216,10 +216,10 @@ nsContentAreaDragDrop::AddDragListener() { nsresult rv = NS_ERROR_FAILURE; - if (mEventTarget) { + if ( mEventReceiver ) { nsIDOMDragListener *pListener = NS_STATIC_CAST(nsIDOMDragListener *, this); - rv = mEventTarget->AddEventListenerByIID(pListener, - NS_GET_IID(nsIDOMDragListener)); + rv = mEventReceiver->AddEventListenerByIID(pListener, + NS_GET_IID(nsIDOMDragListener)); if (NS_SUCCEEDED(rv)) mListenerInstalled = PR_TRUE; } @@ -238,14 +238,14 @@ nsContentAreaDragDrop::RemoveDragListener() { nsresult rv = NS_ERROR_FAILURE; - if (mEventTarget) { + if (mEventReceiver) { nsIDOMDragListener *pListener = NS_STATIC_CAST(nsIDOMDragListener *, this); rv = - mEventTarget->RemoveEventListenerByIID(pListener, - NS_GET_IID(nsIDOMDragListener)); + mEventReceiver->RemoveEventListenerByIID(pListener, + NS_GET_IID(nsIDOMDragListener)); if (NS_SUCCEEDED(rv)) mListenerInstalled = PR_FALSE; - mEventTarget = nsnull; + mEventReceiver = nsnull; } return rv; diff --git a/content/base/src/nsContentAreaDragDrop.h b/content/base/src/nsContentAreaDragDrop.h index 16549bc64528..9522fed12196 100644 --- a/content/base/src/nsContentAreaDragDrop.h +++ b/content/base/src/nsContentAreaDragDrop.h @@ -44,7 +44,7 @@ #include "nsIDragDropHandler.h" #include "nsIDOMDragListener.h" -#include "nsPIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsITransferable.h" class nsIDOMNode; @@ -120,7 +120,7 @@ private: PRPackedBool mListenerInstalled; - nsCOMPtr mEventTarget; + nsCOMPtr mEventReceiver; // weak ref, this is probably my owning webshell // FIXME: we set this and never null it out. That's bad! See bug 332187. diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index 2342e0df03a2..89963890ce77 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -107,6 +107,7 @@ #include "nsCRT.h" #include "nsIDOMEvent.h" #include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIPrivateDOMEvent.h" #include "nsIDOMDocumentEvent.h" #ifdef MOZ_XTF @@ -2979,10 +2980,10 @@ nsContentUtils::HasMutationListeners(nsINode* aNode, } // If we have a window, we can check it for mutation listeners now. - nsCOMPtr piTarget(do_QueryInterface(window)); - if (piTarget) { + nsCOMPtr rec(do_QueryInterface(window)); + if (rec) { nsCOMPtr manager; - piTarget->GetListenerManager(PR_FALSE, getter_AddRefs(manager)); + rec->GetListenerManager(PR_FALSE, getter_AddRefs(manager)); if (manager) { PRBool hasListeners = PR_FALSE; manager->HasMutationListeners(&hasListeners); diff --git a/content/base/src/nsDOMAttribute.cpp b/content/base/src/nsDOMAttribute.cpp index 577804ab4682..ed82910b0c5f 100644 --- a/content/base/src/nsDOMAttribute.cpp +++ b/content/base/src/nsDOMAttribute.cpp @@ -56,7 +56,6 @@ #include "nsGkAtoms.h" #include "nsCOMArray.h" #include "nsNodeUtils.h" -#include "nsIEventListenerManager.h" //---------------------------------------------------------------------- PRBool nsDOMAttribute::sInitialized; @@ -735,48 +734,13 @@ nsDOMAttribute::DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent, return NS_ERROR_NOT_IMPLEMENTED; } -nsresult +NS_IMETHODIMP nsDOMAttribute::GetListenerManager(PRBool aCreateIfNotFound, nsIEventListenerManager** aResult) { return nsContentUtils::GetListenerManager(this, aCreateIfNotFound, aResult); } -nsresult -nsDOMAttribute::AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID) -{ - nsCOMPtr elm; - nsresult rv = GetListenerManager(PR_TRUE, getter_AddRefs(elm)); - if (elm) { - return elm->AddEventListenerByIID(aListener, aIID, NS_EVENT_FLAG_BUBBLE); - } - return rv; -} - -nsresult -nsDOMAttribute::RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID) -{ - nsCOMPtr elm; - GetListenerManager(PR_FALSE, getter_AddRefs(elm)); - if (elm) { - return elm->RemoveEventListenerByIID(aListener, aIID, NS_EVENT_FLAG_BUBBLE); - } - return NS_OK; -} - -nsresult -nsDOMAttribute::GetSystemEventGroup(nsIDOMEventGroup** aGroup) -{ - nsCOMPtr elm; - nsresult rv = GetListenerManager(PR_TRUE, getter_AddRefs(elm)); - if (elm) { - return elm->GetSystemEventGroupLM(aGroup); - } - return rv; -} - nsresult nsDOMAttribute::EnsureChildState(PRBool aSetText, PRBool &aHasChild) const { diff --git a/content/base/src/nsDOMAttribute.h b/content/base/src/nsDOMAttribute.h index 619ca8a2dfd6..841cc9c66806 100644 --- a/content/base/src/nsDOMAttribute.h +++ b/content/base/src/nsDOMAttribute.h @@ -100,13 +100,8 @@ public: virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - virtual nsresult GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult); - virtual nsresult AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult GetSystemEventGroup(nsIDOMEventGroup** aGroup); + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult); virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const; static void Initialize(); diff --git a/content/base/src/nsDOMParser.cpp b/content/base/src/nsDOMParser.cpp index e225dc15eda2..c4a11867a884 100644 --- a/content/base/src/nsDOMParser.cpp +++ b/content/base/src/nsDOMParser.cpp @@ -50,6 +50,7 @@ #include "nsIDOMClassInfo.h" #include "nsReadableUtils.h" #include "nsCRT.h" +#include "nsIDOMEventReceiver.h" #include "nsLoadListenerProxy.h" #include "nsStreamUtils.h" #include "nsThreadUtils.h" @@ -223,7 +224,7 @@ nsDOMParser::ParseFromStream(nsIInputStream *stream, NS_ENSURE_SUCCESS(rv, rv); // Register as a load listener on the document - nsCOMPtr target(do_QueryInterface(domDocument)); + nsCOMPtr target(do_QueryInterface(domDocument)); if (target) { nsWeakPtr requestWeak(do_GetWeakReference(NS_STATIC_CAST(nsIDOMParser*, this))); nsLoadListenerProxy* proxy = new nsLoadListenerProxy(requestWeak); diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 45404915575c..efc3bc91fdc9 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -911,6 +911,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDocument) NS_INTERFACE_MAP_ENTRY(nsIDOMDocumentTraversal) NS_INTERFACE_MAP_ENTRY(nsIDOMDocumentXBL) NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal) + NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget) @@ -4543,7 +4544,7 @@ nsDocument::GetOwnerDocument(nsIDOMDocument** aOwnerDocument) return NS_OK; } -nsresult +NS_IMETHODIMP nsDocument::GetListenerManager(PRBool aCreateIfNotFound, nsIEventListenerManager** aInstancePtrResult) { @@ -4569,7 +4570,7 @@ nsDocument::GetListenerManager(PRBool aCreateIfNotFound, return NS_OK; } -nsresult +NS_IMETHODIMP nsDocument::GetSystemEventGroup(nsIDOMEventGroup **aGroup) { nsCOMPtr manager; @@ -5428,10 +5429,10 @@ PRBool nsDocument::CanSavePresentation(nsIRequest *aNewRequest) { // Check our event listener manager for unload/beforeunload listeners. - nsCOMPtr piTarget = do_QueryInterface(mScriptGlobalObject); - if (piTarget) { + nsCOMPtr er = do_QueryInterface(mScriptGlobalObject); + if (er) { nsCOMPtr manager; - piTarget->GetListenerManager(PR_FALSE, getter_AddRefs(manager)); + er->GetListenerManager(PR_FALSE, getter_AddRefs(manager)); if (manager && manager->HasUnloadListeners()) { return PR_FALSE; } diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h index 0d840771cf0d..17d38c013807 100644 --- a/content/base/src/nsDocument.h +++ b/content/base/src/nsDocument.h @@ -59,6 +59,7 @@ #include "nsIDOMDocumentRange.h" #include "nsIDOMDocumentTraversal.h" #include "nsStubDocumentObserver.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMNSEventTarget.h" #include "nsIDOMStyleSheetList.h" @@ -287,7 +288,7 @@ class nsDocument : public nsIDocument, public nsIDOMDocumentXBL, public nsIDOM3Document, public nsSupportsWeakReference, - public nsIDOMEventTarget, + public nsIDOMEventReceiver, public nsIDOM3EventTarget, public nsIDOMNSEventTarget, public nsIScriptObjectPrincipal, @@ -530,13 +531,6 @@ public: virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - virtual nsresult GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult); - virtual nsresult AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult GetSystemEventGroup(nsIDOMEventGroup** aGroup); virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const { return NS_ERROR_NOT_IMPLEMENTED; @@ -608,6 +602,15 @@ public: // nsIDOMDocumentXBL NS_DECL_NSIDOMDOCUMENTXBL + // nsIDOMEventReceiver interface + NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID); + NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID); + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult); + NS_IMETHOD GetSystemEventGroup(nsIDOMEventGroup** aGroup); + // nsIDOMEventTarget NS_DECL_NSIDOMEVENTTARGET diff --git a/content/base/src/nsGenericDOMDataNode.cpp b/content/base/src/nsGenericDOMDataNode.cpp index 0dcda08044fa..1d9480753aa3 100644 --- a/content/base/src/nsGenericDOMDataNode.cpp +++ b/content/base/src/nsGenericDOMDataNode.cpp @@ -92,6 +92,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGenericDOMDataNode) NS_INTERFACE_MAP_ENTRY(nsIContent) NS_INTERFACE_MAP_ENTRY(nsINode) NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget) + NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMEventReceiver, + nsDOMEventRTTearoff::Create(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMEventTarget, nsDOMEventRTTearoff::Create(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3EventTarget, @@ -709,48 +711,13 @@ nsGenericDOMDataNode::DispatchDOMEvent(nsEvent* aEvent, aPresContext, aEventStatus); } -nsresult +NS_IMETHODIMP nsGenericDOMDataNode::GetListenerManager(PRBool aCreateIfNotFound, nsIEventListenerManager** aResult) { return nsContentUtils::GetListenerManager(this, aCreateIfNotFound, aResult); } -nsresult -nsGenericDOMDataNode::AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID) -{ - nsCOMPtr elm; - nsresult rv = GetListenerManager(PR_TRUE, getter_AddRefs(elm)); - if (elm) { - return elm->AddEventListenerByIID(aListener, aIID, NS_EVENT_FLAG_BUBBLE); - } - return rv; -} - -nsresult -nsGenericDOMDataNode::RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID) -{ - nsCOMPtr elm; - GetListenerManager(PR_FALSE, getter_AddRefs(elm)); - if (elm) { - return elm->RemoveEventListenerByIID(aListener, aIID, NS_EVENT_FLAG_BUBBLE); - } - return NS_OK; -} - -nsresult -nsGenericDOMDataNode::GetSystemEventGroup(nsIDOMEventGroup** aGroup) -{ - nsCOMPtr elm; - nsresult rv = GetListenerManager(PR_TRUE, getter_AddRefs(elm)); - if (elm) { - return elm->GetSystemEventGroupLM(aGroup); - } - return rv; -} - PRUint32 nsGenericDOMDataNode::GetChildCount() const { diff --git a/content/base/src/nsGenericDOMDataNode.h b/content/base/src/nsGenericDOMDataNode.h index 94209db51c23..a198e4a499f3 100644 --- a/content/base/src/nsGenericDOMDataNode.h +++ b/content/base/src/nsGenericDOMDataNode.h @@ -44,7 +44,7 @@ #define nsGenericDOMDataNode_h___ #include "nsIDOMCharacterData.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsTextFragment.h" #include "nsVoidArray.h" #include "nsDOMError.h" @@ -180,13 +180,8 @@ public: virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - virtual nsresult GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult); - virtual nsresult AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult GetSystemEventGroup(nsIDOMEventGroup** aGroup); + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult); // Implementation for nsIContent virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, diff --git a/content/base/src/nsGenericElement.cpp b/content/base/src/nsGenericElement.cpp index fae950546883..7cfdfa8acfbc 100644 --- a/content/base/src/nsGenericElement.cpp +++ b/content/base/src/nsGenericElement.cpp @@ -51,6 +51,7 @@ #include "nsIDOMNodeList.h" #include "nsIDOMDocument.h" #include "nsIDOMText.h" +#include "nsIDOMEventReceiver.h" #include "nsIContentIterator.h" #include "nsIEventListenerManager.h" #include "nsIFocusController.h" @@ -214,48 +215,13 @@ nsINode::UnsetProperty(PRUint16 aCategory, nsIAtom *aPropertyName, aStatus); } -nsresult +NS_IMETHODIMP nsGenericElement::GetListenerManager(PRBool aCreateIfNotFound, nsIEventListenerManager** aResult) { return nsContentUtils::GetListenerManager(this, aCreateIfNotFound, aResult); } -nsresult -nsGenericElement::AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID) -{ - nsCOMPtr elm; - nsresult rv = GetListenerManager(PR_TRUE, getter_AddRefs(elm)); - if (elm) { - return elm->AddEventListenerByIID(aListener, aIID, NS_EVENT_FLAG_BUBBLE); - } - return rv; -} - -nsresult -nsGenericElement::RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID) -{ - nsCOMPtr elm; - GetListenerManager(PR_FALSE, getter_AddRefs(elm)); - if (elm) { - return elm->RemoveEventListenerByIID(aListener, aIID, NS_EVENT_FLAG_BUBBLE); - } - return NS_OK; -} - -nsresult -nsGenericElement::GetSystemEventGroup(nsIDOMEventGroup** aGroup) -{ - nsCOMPtr elm; - nsresult rv = GetListenerManager(PR_TRUE, getter_AddRefs(elm)); - if (elm) { - return elm->GetSystemEventGroupLM(aGroup); - } - return rv; -} - nsINode::nsSlots* nsINode::CreateSlots() { @@ -730,6 +696,7 @@ NS_IMPL_CYCLE_COLLECTION_1(nsDOMEventRTTearoff, mContent) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMEventRTTearoff) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) + NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver) NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOMNSEventTarget) NS_INTERFACE_MAP_END_AGGREGATED(mContent) @@ -795,6 +762,17 @@ nsDOMEventRTTearoff::LastRelease() delete this; } +nsresult +nsDOMEventRTTearoff::GetEventReceiver(nsIDOMEventReceiver **aReceiver) +{ + nsCOMPtr listener_manager; + nsresult rv = + mContent->GetListenerManager(PR_TRUE, getter_AddRefs(listener_manager)); + NS_ENSURE_SUCCESS(rv, rv); + + return CallQueryInterface(listener_manager, aReceiver); +} + nsresult nsDOMEventRTTearoff::GetDOM3EventTarget(nsIDOM3EventTarget **aTarget) { @@ -806,6 +784,48 @@ nsDOMEventRTTearoff::GetDOM3EventTarget(nsIDOM3EventTarget **aTarget) return CallQueryInterface(listener_manager, aTarget); } +NS_IMETHODIMP +nsDOMEventRTTearoff::AddEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID) +{ + nsCOMPtr event_receiver; + nsresult rv = GetEventReceiver(getter_AddRefs(event_receiver)); + NS_ENSURE_SUCCESS(rv, rv); + + return event_receiver->AddEventListenerByIID(aListener, aIID); +} + +NS_IMETHODIMP +nsDOMEventRTTearoff::RemoveEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID) +{ + nsCOMPtr event_receiver; + nsresult rv = GetEventReceiver(getter_AddRefs(event_receiver)); + NS_ENSURE_SUCCESS(rv, rv); + + return event_receiver->RemoveEventListenerByIID(aListener, aIID); +} + +NS_IMETHODIMP +nsDOMEventRTTearoff::GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult) +{ + return mContent->GetListenerManager(aCreateIfNotFound, aResult); +} + +NS_IMETHODIMP +nsDOMEventRTTearoff::GetSystemEventGroup(nsIDOMEventGroup **aGroup) +{ + nsCOMPtr manager; + GetListenerManager(PR_TRUE, getter_AddRefs(manager)); + + if (!manager) { + return NS_ERROR_FAILURE; + } + + return manager->GetSystemEventGroupLM(aGroup); +} + NS_IMETHODIMP nsDOMEventRTTearoff::GetScriptTypeID(PRUint32 *aLang) { @@ -832,21 +852,25 @@ nsDOMEventRTTearoff::AddEventListener(const nsAString& aType, } NS_IMETHODIMP -nsDOMEventRTTearoff::RemoveEventListener(const nsAString& aType, - nsIDOMEventListener* aListener, - PRBool aUseCapture) +nsDOMEventRTTearoff::RemoveEventListener(const nsAString& type, + nsIDOMEventListener *listener, + PRBool useCapture) { - return RemoveGroupedEventListener(aType, aListener, aUseCapture, nsnull); + nsCOMPtr event_receiver; + nsresult rv = GetEventReceiver(getter_AddRefs(event_receiver)); + NS_ENSURE_SUCCESS(rv, rv); + + return event_receiver->RemoveEventListener(type, listener, useCapture); } NS_IMETHODIMP -nsDOMEventRTTearoff::DispatchEvent(nsIDOMEvent *aEvt, PRBool* _retval) +nsDOMEventRTTearoff::DispatchEvent(nsIDOMEvent *evt, PRBool* _retval) { - nsEventStatus status = nsEventStatus_eIgnore; - nsresult rv = nsEventDispatcher::DispatchDOMEvent( - NS_STATIC_CAST(nsPIDOMEventTarget*, mContent), nsnull, aEvt, nsnull, &status); - *_retval = (status != nsEventStatus_eConsumeNoDefault); - return rv; + nsCOMPtr event_receiver; + nsresult rv = GetEventReceiver(getter_AddRefs(event_receiver)); + NS_ENSURE_SUCCESS(rv, rv); + + return event_receiver->DispatchEvent(evt, _retval); } // nsIDOM3EventTarget @@ -3035,6 +3059,8 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGenericElement) NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3Node, new nsNode3Tearoff(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMNSElement, new nsNSElementTearoff(this)) + NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMEventReceiver, + nsDOMEventRTTearoff::Create(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOMEventTarget, nsDOMEventRTTearoff::Create(this)) NS_INTERFACE_MAP_ENTRY_TEAROFF(nsIDOM3EventTarget, diff --git a/content/base/src/nsGenericElement.h b/content/base/src/nsGenericElement.h index baaf31ef8836..e1715c059d81 100644 --- a/content/base/src/nsGenericElement.h +++ b/content/base/src/nsGenericElement.h @@ -49,7 +49,7 @@ #include "nsIContent.h" #include "nsIDOMElement.h" #include "nsIDOMDocumentFragment.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOM3EventTarget.h" #include "nsIDOM3Node.h" #include "nsIDOMNSEventTarget.h" @@ -225,7 +225,7 @@ private: * @see nsDOMEventRTTearoff::Create */ -class nsDOMEventRTTearoff : public nsIDOMEventTarget, +class nsDOMEventRTTearoff : public nsIDOMEventReceiver, public nsIDOM3EventTarget, public nsIDOMNSEventTarget { @@ -248,6 +248,7 @@ private: */ void LastRelease(); + nsresult GetEventReceiver(nsIDOMEventReceiver **aReceiver); nsresult GetDOM3EventTarget(nsIDOM3EventTarget **aTarget); public: @@ -273,6 +274,15 @@ public: // nsIDOM3EventTarget NS_DECL_NSIDOM3EVENTTARGET + // nsIDOMEventReceiver + NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID); + NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID); + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult); + NS_IMETHOD GetSystemEventGroup(nsIDOMEventGroup** aGroup); + // nsIDOMNSEventTarget NS_DECL_NSIDOMNSEVENTTARGET @@ -389,13 +399,8 @@ public: virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - virtual nsresult GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult); - virtual nsresult AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult GetSystemEventGroup(nsIDOMEventGroup** aGroup); + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult); // nsIContent interface methods virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, diff --git a/content/base/src/nsSyncLoadService.cpp b/content/base/src/nsSyncLoadService.cpp index 353851aa9b41..18d5f96d7156 100644 --- a/content/base/src/nsSyncLoadService.cpp +++ b/content/base/src/nsSyncLoadService.cpp @@ -51,6 +51,7 @@ #include "nsIDocument.h" #include "nsIDOMDocument.h" #include "nsIDOMDOMImplementation.h" +#include "nsIDOMEventReceiver.h" #include "nsIPrivateDOMImplementation.h" #include "nsIScriptSecurityManager.h" #include "nsContentUtils.h" @@ -224,7 +225,7 @@ nsSyncLoader::LoadDocument(nsIChannel* aChannel, } // Register as a load listener on the document - nsCOMPtr target = do_QueryInterface(document); + nsCOMPtr target = do_QueryInterface(document); NS_ENSURE_TRUE(target, NS_ERROR_FAILURE); nsWeakPtr requestWeak = do_GetWeakReference(NS_STATIC_CAST(nsIDOMLoadListener*, this)); diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index b800445bde55..d4451e6a6f8a 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -50,6 +50,7 @@ #include "nsIDOMSerializer.h" #include "nsXPCOM.h" #include "nsISupportsPrimitives.h" +#include "nsIDOMEventReceiver.h" #include "nsIEventListenerManager.h" #include "nsGUIEvent.h" #include "nsIPrivateDOMEvent.h" @@ -1301,7 +1302,7 @@ nsXMLHttpRequest::OnStartRequest(nsIRequest *request, nsISupports *ctxt) mResponseBody.Truncate(); // Register as a load listener on the document - nsCOMPtr target(do_QueryInterface(mDocument)); + nsCOMPtr target(do_QueryInterface(mDocument)); if (target) { nsWeakPtr requestWeak = do_GetWeakReference(NS_STATIC_CAST(nsIXMLHttpRequest*, this)); diff --git a/content/events/public/nsPIDOMEventTarget.h b/content/events/public/nsPIDOMEventTarget.h index 3d8f18c1ebdb..1e07d11a935d 100644 --- a/content/events/public/nsPIDOMEventTarget.h +++ b/content/events/public/nsPIDOMEventTarget.h @@ -46,13 +46,11 @@ class nsPresContext; class nsEventChainPreVisitor; class nsEventChainPostVisitor; class nsIEventListenerManager; -class nsIDOMEventListener; -class nsIDOMEventGroup; // 360fa72e-c709-42cc-9285-1f755ec90376 #define NS_PIDOMEVENTTARGET_IID \ - { 0x44a6597b, 0x9fc3, 0x4a8d, \ - { 0xb7, 0xa4, 0xd9, 0x00, 0x9a, 0xbf, 0x9d, 0x15 } } +{ 0x360fa72e, 0xc709, 0x42cc, \ + { 0x92, 0x85, 0x1f, 0x75, 0x5e, 0xc9, 0x03, 0x76 } } class nsPIDOMEventTarget : public nsISupports { @@ -131,24 +129,8 @@ public: * one already exists. [IN] * @param aResult The event listener manager [OUT] */ - virtual nsresult GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult) = 0; - - /** - * Add an event listener for nsIID. - */ - virtual nsresult AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID) = 0; - /** - * Remove event listener for nsIID. - */ - virtual nsresult RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID) = 0; - - /** - * Get the system event group. - */ - virtual nsresult GetSystemEventGroup(nsIDOMEventGroup** aGroup) = 0; + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult) = 0; }; NS_DEFINE_STATIC_IID_ACCESSOR(nsPIDOMEventTarget, NS_PIDOMEVENTTARGET_IID) diff --git a/content/events/src/nsEventDispatcher.cpp b/content/events/src/nsEventDispatcher.cpp index 31a51000427c..91171597ba59 100644 --- a/content/events/src/nsEventDispatcher.cpp +++ b/content/events/src/nsEventDispatcher.cpp @@ -43,6 +43,7 @@ #include "nsPIDOMEventTarget.h" #include "nsPresContext.h" #include "nsIPrivateDOMEvent.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMEventTarget.h" #include "nsIEventListenerManager.h" #include "nsPIDOMWindow.h" diff --git a/content/events/src/nsEventListenerManager.cpp b/content/events/src/nsEventListenerManager.cpp index 5af2eda0227b..c7ad28e6f988 100644 --- a/content/events/src/nsEventListenerManager.cpp +++ b/content/events/src/nsEventListenerManager.cpp @@ -393,6 +393,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsEventListenerManager) NS_INTERFACE_MAP_ENTRY(nsIEventListenerManager) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget) + NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver) NS_INTERFACE_MAP_END NS_IMPL_CYCLE_COLLECTING_ADDREF_AMBIGUOUS(nsEventListenerManager, nsIEventListenerManager) @@ -1372,6 +1373,35 @@ nsEventListenerManager::IsRegisteredHere(const nsAString & type, PRBool *_retval return NS_ERROR_NOT_IMPLEMENTED; } +// nsIDOMEventReceiver interface +NS_IMETHODIMP +nsEventListenerManager::AddEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID) +{ + return AddEventListenerByIID(aListener, aIID, NS_EVENT_FLAG_BUBBLE); +} + +NS_IMETHODIMP +nsEventListenerManager::RemoveEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID) +{ + return RemoveEventListenerByIID(aListener, aIID, NS_EVENT_FLAG_BUBBLE); +} + +NS_IMETHODIMP +nsEventListenerManager::GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult) +{ + NS_ENSURE_ARG_POINTER(aResult); + NS_ADDREF(*aResult = this); + return NS_OK; +} + +NS_IMETHODIMP +nsEventListenerManager::GetSystemEventGroup(nsIDOMEventGroup **aGroup) +{ + return GetSystemEventGroupLM(aGroup); +} + nsresult nsEventListenerManager::FixContextMenuEvent(nsPresContext* aPresContext, nsISupports* aCurrentTarget, diff --git a/content/events/src/nsEventListenerManager.h b/content/events/src/nsEventListenerManager.h index 91f74ed7a80c..6fdaaf7dea66 100644 --- a/content/events/src/nsEventListenerManager.h +++ b/content/events/src/nsEventListenerManager.h @@ -42,7 +42,7 @@ #include "jsapi.h" #include "nsCOMPtr.h" #include "nsAutoPtr.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOM3EventTarget.h" #include "nsHashtable.h" #include "nsIScriptContext.h" @@ -68,7 +68,7 @@ typedef struct { */ class nsEventListenerManager : public nsIEventListenerManager, - public nsIDOMEventTarget, + public nsIDOMEventReceiver, public nsIDOM3EventTarget { @@ -139,6 +139,15 @@ public: // nsIDOM3EventTarget NS_DECL_NSIDOM3EVENTTARGET + // nsIDOMEventReceiver interface + NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID); + NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID); + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult); + NS_IMETHOD GetSystemEventGroup(nsIDOMEventGroup** aGroup); + static void Shutdown(); NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsEventListenerManager, diff --git a/content/events/src/nsXMLEventsManager.cpp b/content/events/src/nsXMLEventsManager.cpp index 9be1dd59bf5b..23b863024413 100644 --- a/content/events/src/nsXMLEventsManager.cpp +++ b/content/events/src/nsXMLEventsManager.cpp @@ -41,7 +41,7 @@ #include "nsGkAtoms.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsNetUtil.h" #include "nsIURL.h" #include "nsIDOMEventListener.h" diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index f3182f6fc9a8..4d0387519323 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -50,6 +50,7 @@ #include "nsIDOMHTMLBodyElement.h" #include "nsIDOMHTMLDocument.h" #include "nsIDOMAttr.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMDocumentFragment.h" #include "nsIDOMNSHTMLDocument.h" #include "nsIDOMNSHTMLElement.h" @@ -1376,10 +1377,10 @@ nsGenericHTMLElement::GetEventListenerManagerForAttr(nsIEventListenerManager** a nsIDocument *document = GetOwnerDoc(); nsresult rv = NS_OK; if (document && (win = document->GetInnerWindow())) { - nsCOMPtr piTarget(do_QueryInterface(win)); - NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE); + nsCOMPtr receiver(do_QueryInterface(win)); + NS_ENSURE_TRUE(receiver, NS_ERROR_FAILURE); - rv = piTarget->GetListenerManager(PR_TRUE, aManager); + rv = receiver->GetListenerManager(PR_TRUE, aManager); if (NS_SUCCEEDED(rv)) { NS_ADDREF(*aTarget = win); diff --git a/content/html/content/src/nsHTMLAnchorElement.cpp b/content/html/content/src/nsHTMLAnchorElement.cpp index 9f238743d5b4..11ec47e5ef56 100644 --- a/content/html/content/src/nsHTMLAnchorElement.cpp +++ b/content/html/content/src/nsHTMLAnchorElement.cpp @@ -41,7 +41,7 @@ #include "nsUnicharUtils.h" #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMNSHTMLAnchorElement2.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIHTMLDocument.h" #include "nsGenericHTMLElement.h" #include "nsILink.h" diff --git a/content/html/content/src/nsHTMLAreaElement.cpp b/content/html/content/src/nsHTMLAreaElement.cpp index 4f32b9d5be45..07d2f85f8185 100644 --- a/content/html/content/src/nsHTMLAreaElement.cpp +++ b/content/html/content/src/nsHTMLAreaElement.cpp @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLAreaElement.h" #include "nsIDOMNSHTMLAreaElement2.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsILink.h" #include "nsIPresShell.h" diff --git a/content/html/content/src/nsHTMLBRElement.cpp b/content/html/content/src/nsHTMLBRElement.cpp index 36eeadc6dec2..d45e078ed686 100644 --- a/content/html/content/src/nsHTMLBRElement.cpp +++ b/content/html/content/src/nsHTMLBRElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLBRElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLBodyElement.cpp b/content/html/content/src/nsHTMLBodyElement.cpp index 6b6f8af4dabc..ee99df8b0299 100644 --- a/content/html/content/src/nsHTMLBodyElement.cpp +++ b/content/html/content/src/nsHTMLBodyElement.cpp @@ -38,7 +38,7 @@ #include "nscore.h" #include "nsCOMPtr.h" #include "nsIDOMHTMLBodyElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLButtonElement.cpp b/content/html/content/src/nsHTMLButtonElement.cpp index e928a1311ce0..0e0f782782a7 100644 --- a/content/html/content/src/nsHTMLButtonElement.cpp +++ b/content/html/content/src/nsHTMLButtonElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLButtonElement.h" #include "nsIDOMNSHTMLButtonElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsIPresShell.h" diff --git a/content/html/content/src/nsHTMLDelElement.cpp b/content/html/content/src/nsHTMLDelElement.cpp index b7d9105442fb..bc8ad02c7a93 100644 --- a/content/html/content/src/nsHTMLDelElement.cpp +++ b/content/html/content/src/nsHTMLDelElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLModElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLDivElement.cpp b/content/html/content/src/nsHTMLDivElement.cpp index 4573262c1abd..d3e943a7549b 100644 --- a/content/html/content/src/nsHTMLDivElement.cpp +++ b/content/html/content/src/nsHTMLDivElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLDivElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLFieldSetElement.cpp b/content/html/content/src/nsHTMLFieldSetElement.cpp index c23b88629e5e..90ef721de9a5 100644 --- a/content/html/content/src/nsHTMLFieldSetElement.cpp +++ b/content/html/content/src/nsHTMLFieldSetElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLFieldSetElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsStyleConsts.h" #include "nsPresContext.h" diff --git a/content/html/content/src/nsHTMLFontElement.cpp b/content/html/content/src/nsHTMLFontElement.cpp index 75b61f66411f..62861d334197 100644 --- a/content/html/content/src/nsHTMLFontElement.cpp +++ b/content/html/content/src/nsHTMLFontElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "nsIDOMHTMLFontElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsIDeviceContext.h" diff --git a/content/html/content/src/nsHTMLFormElement.cpp b/content/html/content/src/nsHTMLFormElement.cpp index 84230618c703..fadfb8978534 100644 --- a/content/html/content/src/nsHTMLFormElement.cpp +++ b/content/html/content/src/nsHTMLFormElement.cpp @@ -42,7 +42,7 @@ #include "nsIDOMNSHTMLFormElement.h" #include "nsIHTMLDocument.h" #include "nsIDOMNSHTMLFormControlList.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsEventStateManager.h" #include "nsGkAtoms.h" diff --git a/content/html/content/src/nsHTMLFrameSetElement.cpp b/content/html/content/src/nsHTMLFrameSetElement.cpp index fccc4f74ec94..5bad7da64700 100644 --- a/content/html/content/src/nsHTMLFrameSetElement.cpp +++ b/content/html/content/src/nsHTMLFrameSetElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLFrameSetElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLHRElement.cpp b/content/html/content/src/nsHTMLHRElement.cpp index 15d64a536c08..8d744bb95f0f 100644 --- a/content/html/content/src/nsHTMLHRElement.cpp +++ b/content/html/content/src/nsHTMLHRElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLHRElement.h" #include "nsIDOMNSHTMLHRElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLHeadElement.cpp b/content/html/content/src/nsHTMLHeadElement.cpp index 50d45f51de88..94c2d746ad6c 100644 --- a/content/html/content/src/nsHTMLHeadElement.cpp +++ b/content/html/content/src/nsHTMLHeadElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLHeadElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLHeadingElement.cpp b/content/html/content/src/nsHTMLHeadingElement.cpp index de544499d75d..4ca64c18934e 100644 --- a/content/html/content/src/nsHTMLHeadingElement.cpp +++ b/content/html/content/src/nsHTMLHeadingElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLHeadingElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLHtmlElement.cpp b/content/html/content/src/nsHTMLHtmlElement.cpp index fb43004d268f..89d9f81e58a2 100644 --- a/content/html/content/src/nsHTMLHtmlElement.cpp +++ b/content/html/content/src/nsHTMLHtmlElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLHtmlElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLImageElement.cpp b/content/html/content/src/nsHTMLImageElement.cpp index b6d75ba9151d..afe937f15a7a 100644 --- a/content/html/content/src/nsHTMLImageElement.cpp +++ b/content/html/content/src/nsHTMLImageElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLImageElement.h" #include "nsIDOMNSHTMLImageElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsImageLoadingContent.h" #include "nsGkAtoms.h" diff --git a/content/html/content/src/nsHTMLInputElement.cpp b/content/html/content/src/nsHTMLInputElement.cpp index 517714bbd513..9f425bebac0f 100644 --- a/content/html/content/src/nsHTMLInputElement.cpp +++ b/content/html/content/src/nsHTMLInputElement.cpp @@ -51,7 +51,7 @@ #include "nsContentCID.h" #include "nsIComponentManager.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" @@ -88,7 +88,7 @@ #include "nsLayoutUtils.h" #include "nsIDOMMutationEvent.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsMutationEvent.h" #include "nsIEventListenerManager.h" diff --git a/content/html/content/src/nsHTMLLIElement.cpp b/content/html/content/src/nsHTMLLIElement.cpp index 72463937f144..8a7b8c30a707 100644 --- a/content/html/content/src/nsHTMLLIElement.cpp +++ b/content/html/content/src/nsHTMLLIElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLLIElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLLabelElement.cpp b/content/html/content/src/nsHTMLLabelElement.cpp index 168bfaa85798..e7568108b8d2 100644 --- a/content/html/content/src/nsHTMLLabelElement.cpp +++ b/content/html/content/src/nsHTMLLabelElement.cpp @@ -37,7 +37,7 @@ #include "nsCOMPtr.h" #include "nsIDOMHTMLLabelElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLLegendElement.cpp b/content/html/content/src/nsHTMLLegendElement.cpp index 1d84337b91e3..05de5d27ce1b 100644 --- a/content/html/content/src/nsHTMLLegendElement.cpp +++ b/content/html/content/src/nsHTMLLegendElement.cpp @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLLegendElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLLinkElement.cpp b/content/html/content/src/nsHTMLLinkElement.cpp index 045f8b772505..21a35e15013a 100644 --- a/content/html/content/src/nsHTMLLinkElement.cpp +++ b/content/html/content/src/nsHTMLLinkElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLLinkElement.h" #include "nsIDOMLinkStyle.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsILink.h" #include "nsGkAtoms.h" diff --git a/content/html/content/src/nsHTMLMapElement.cpp b/content/html/content/src/nsHTMLMapElement.cpp index 8b39631b7c1b..4f434b31dd59 100644 --- a/content/html/content/src/nsHTMLMapElement.cpp +++ b/content/html/content/src/nsHTMLMapElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLMapElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLMetaElement.cpp b/content/html/content/src/nsHTMLMetaElement.cpp index 5732268e4b90..1217c1d2f3f2 100644 --- a/content/html/content/src/nsHTMLMetaElement.cpp +++ b/content/html/content/src/nsHTMLMetaElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLMetaElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLOListElement.cpp b/content/html/content/src/nsHTMLOListElement.cpp index 9418beb41281..6db9067090bb 100644 --- a/content/html/content/src/nsHTMLOListElement.cpp +++ b/content/html/content/src/nsHTMLOListElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLOListElement.h" #include "nsIDOMHTMLDListElement.h" #include "nsIDOMHTMLUListElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLOptGroupElement.cpp b/content/html/content/src/nsHTMLOptGroupElement.cpp index 2587b30700bf..0ba16b57d09b 100644 --- a/content/html/content/src/nsHTMLOptGroupElement.cpp +++ b/content/html/content/src/nsHTMLOptGroupElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLOptGroupElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLOptionElement.cpp b/content/html/content/src/nsHTMLOptionElement.cpp index c623dc3db091..936fd738f0e6 100644 --- a/content/html/content/src/nsHTMLOptionElement.cpp +++ b/content/html/content/src/nsHTMLOptionElement.cpp @@ -41,7 +41,7 @@ #include "nsIOptionElement.h" #include "nsIDOMHTMLOptGroupElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLParagraphElement.cpp b/content/html/content/src/nsHTMLParagraphElement.cpp index 17f2eda41e25..17ffa7c16bd4 100644 --- a/content/html/content/src/nsHTMLParagraphElement.cpp +++ b/content/html/content/src/nsHTMLParagraphElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLParagraphElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLPreElement.cpp b/content/html/content/src/nsHTMLPreElement.cpp index 9935b895477b..cda03ed5e764 100644 --- a/content/html/content/src/nsHTMLPreElement.cpp +++ b/content/html/content/src/nsHTMLPreElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLPreElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLScriptElement.cpp b/content/html/content/src/nsHTMLScriptElement.cpp index 6d461fe1f32e..27a81f902f88 100644 --- a/content/html/content/src/nsHTMLScriptElement.cpp +++ b/content/html/content/src/nsHTMLScriptElement.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLScriptElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLSelectElement.cpp b/content/html/content/src/nsHTMLSelectElement.cpp index a131dee6c996..a9e6738f3659 100644 --- a/content/html/content/src/nsHTMLSelectElement.cpp +++ b/content/html/content/src/nsHTMLSelectElement.cpp @@ -42,7 +42,7 @@ #include "nsIDOMNSHTMLSelectElement.h" #include "nsIDOMNSXBLFormControl.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsContentCreatorFunctions.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/content/html/content/src/nsHTMLSpanElement.cpp b/content/html/content/src/nsHTMLSpanElement.cpp index 2fd3f1a12408..97d9af700e6c 100644 --- a/content/html/content/src/nsHTMLSpanElement.cpp +++ b/content/html/content/src/nsHTMLSpanElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLStyleElement.cpp b/content/html/content/src/nsHTMLStyleElement.cpp index 08eb35f40d5c..32a03e1c34d0 100644 --- a/content/html/content/src/nsHTMLStyleElement.cpp +++ b/content/html/content/src/nsHTMLStyleElement.cpp @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLStyleElement.h" #include "nsIDOMLinkStyle.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLTableCaptionElement.cpp b/content/html/content/src/nsHTMLTableCaptionElement.cpp index 186cd8b924a4..5e77c13070d5 100644 --- a/content/html/content/src/nsHTMLTableCaptionElement.cpp +++ b/content/html/content/src/nsHTMLTableCaptionElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLTableCaptionElem.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLTableCellElement.cpp b/content/html/content/src/nsHTMLTableCellElement.cpp index 8212e0c32cc0..721410cacfbf 100644 --- a/content/html/content/src/nsHTMLTableCellElement.cpp +++ b/content/html/content/src/nsHTMLTableCellElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLTableCellElement.h" #include "nsIDOMHTMLTableRowElement.h" #include "nsIDOMHTMLCollection.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsMappedAttributes.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/content/html/content/src/nsHTMLTableColElement.cpp b/content/html/content/src/nsHTMLTableColElement.cpp index dcd055b3c0bd..ec3d59422483 100644 --- a/content/html/content/src/nsHTMLTableColElement.cpp +++ b/content/html/content/src/nsHTMLTableColElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLTableColElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsMappedAttributes.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/content/html/content/src/nsHTMLTableElement.cpp b/content/html/content/src/nsHTMLTableElement.cpp index 385f48cc4e80..33c812b804d6 100644 --- a/content/html/content/src/nsHTMLTableElement.cpp +++ b/content/html/content/src/nsHTMLTableElement.cpp @@ -38,7 +38,7 @@ #include "nsIDOMHTMLTableCaptionElem.h" #include "nsIDOMHTMLTableSectionElem.h" #include "nsCOMPtr.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsDOMError.h" #include "nsContentList.h" #include "nsMappedAttributes.h" diff --git a/content/html/content/src/nsHTMLTableRowElement.cpp b/content/html/content/src/nsHTMLTableRowElement.cpp index d8bd9f273fb3..c7ce9244ba5c 100644 --- a/content/html/content/src/nsHTMLTableRowElement.cpp +++ b/content/html/content/src/nsHTMLTableRowElement.cpp @@ -38,7 +38,7 @@ #include "nsIDOMHTMLTableElement.h" #include "nsIDOMHTMLTableSectionElem.h" #include "nsIDOMHTMLTableCellElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsDOMError.h" #include "nsMappedAttributes.h" #include "nsGenericHTMLElement.h" diff --git a/content/html/content/src/nsHTMLTableSectionElement.cpp b/content/html/content/src/nsHTMLTableSectionElement.cpp index 8a29e282b108..edbf8c297210 100644 --- a/content/html/content/src/nsHTMLTableSectionElement.cpp +++ b/content/html/content/src/nsHTMLTableSectionElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLTableSectionElem.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsMappedAttributes.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/content/html/content/src/nsHTMLTextAreaElement.cpp b/content/html/content/src/nsHTMLTextAreaElement.cpp index cebf913870a5..f3f294c029ed 100644 --- a/content/html/content/src/nsHTMLTextAreaElement.cpp +++ b/content/html/content/src/nsHTMLTextAreaElement.cpp @@ -50,7 +50,7 @@ #include "nsIFormControl.h" #include "nsIForm.h" #include "nsIFormSubmission.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/content/html/content/src/nsHTMLTitleElement.cpp b/content/html/content/src/nsHTMLTitleElement.cpp index 5aba1cf987ee..0b043c6e0ea9 100644 --- a/content/html/content/src/nsHTMLTitleElement.cpp +++ b/content/html/content/src/nsHTMLTitleElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLTitleElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGenericHTMLElement.h" #include "nsStyleConsts.h" #include "nsPresContext.h" diff --git a/content/svg/content/src/nsSVGElement.cpp b/content/svg/content/src/nsSVGElement.cpp index d8bf9748bf59..d72361ef4513 100644 --- a/content/svg/content/src/nsSVGElement.cpp +++ b/content/svg/content/src/nsSVGElement.cpp @@ -41,7 +41,7 @@ #include "nsIDocument.h" #include "nsRange.h" #include "nsIDOMAttr.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMMutationEvent.h" #include "nsMutationEvent.h" #include "nsBindingManager.h" diff --git a/content/xbl/public/nsIXBLService.h b/content/xbl/public/nsIXBLService.h index c43ba357035f..22b9ca156d78 100644 --- a/content/xbl/public/nsIXBLService.h +++ b/content/xbl/public/nsIXBLService.h @@ -49,7 +49,7 @@ class nsIContent; class nsIDocument; -class nsPIDOMEventTarget; +class nsIDOMEventReceiver; class nsIDOMNodeList; class nsXBLBinding; class nsIXBLDocumentInfo; @@ -57,8 +57,8 @@ class nsIURI; class nsIAtom; #define NS_IXBLSERVICE_IID \ - { 0xefda61b3, 0x5d04, 0x43b0, \ - { 0x98, 0x0c, 0x32, 0x62, 0x72, 0xc8, 0x5c, 0x68 } } + { 0x7157b300, 0xf49b, 0x4e7d, \ + { 0xac, 0x3a, 0xef, 0x8f, 0x20, 0x69, 0x6e, 0xb1 } } class nsIXBLService : public nsISupports { @@ -82,7 +82,7 @@ public: PRBool aForceSyncLoad, nsIXBLDocumentInfo** aResult) = 0; // Hooks up the global key event handlers to the document root. - NS_IMETHOD AttachGlobalKeyHandler(nsPIDOMEventTarget* aTarget)=0; + NS_IMETHOD AttachGlobalKeyHandler(nsIDOMEventReceiver* aElement)=0; }; diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp index 6f8bb707c76f..e975e9836e0c 100644 --- a/content/xbl/src/nsXBLBinding.cpp +++ b/content/xbl/src/nsXBLBinding.cpp @@ -45,7 +45,7 @@ #include "nsHashtable.h" #include "nsIURI.h" #include "nsIURL.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIChannel.h" #include "nsXPIDLString.h" #include "nsReadableUtils.h" @@ -815,8 +815,8 @@ nsXBLBinding::UnhookEventHandlers() nsXBLPrototypeHandler* handlerChain = mPrototypeBinding->GetPrototypeHandlers(); if (handlerChain) { - nsCOMPtr piTarget = do_QueryInterface(mBoundElement); - nsCOMPtr target = do_QueryInterface(piTarget); + nsCOMPtr receiver = do_QueryInterface(mBoundElement); + nsCOMPtr target = do_QueryInterface(receiver); nsCOMPtr systemEventGroup; nsXBLPrototypeHandler* curr; @@ -844,7 +844,7 @@ nsXBLBinding::UnhookEventHandlers() nsIDOMEventGroup* eventGroup = nsnull; if (curr->GetType() & (NS_HANDLER_TYPE_XBL_COMMAND | NS_HANDLER_TYPE_SYSTEM)) { if (!systemEventGroup) - piTarget->GetSystemEventGroup(getter_AddRefs(systemEventGroup)); + receiver->GetSystemEventGroup(getter_AddRefs(systemEventGroup)); eventGroup = systemEventGroup; } @@ -873,7 +873,7 @@ nsXBLBinding::UnhookEventHandlers() nsIDOMEventGroup* eventGroup = nsnull; if (handler->GetType() & (NS_HANDLER_TYPE_XBL_COMMAND | NS_HANDLER_TYPE_SYSTEM)) { if (!systemEventGroup) - piTarget->GetSystemEventGroup(getter_AddRefs(systemEventGroup)); + receiver->GetSystemEventGroup(getter_AddRefs(systemEventGroup)); eventGroup = systemEventGroup; } diff --git a/content/xbl/src/nsXBLEventHandler.cpp b/content/xbl/src/nsXBLEventHandler.cpp index a01f88eb5ef9..a652d213a466 100644 --- a/content/xbl/src/nsXBLEventHandler.cpp +++ b/content/xbl/src/nsXBLEventHandler.cpp @@ -40,8 +40,7 @@ #include "nsIAtom.h" #include "nsIContent.h" #include "nsIDOMEventGroup.h" -#include "nsIDOMEventListener.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMText.h" @@ -81,9 +80,9 @@ nsXBLEventHandler::HandleEvent(nsIDOMEvent* aEvent) nsCOMPtr target; aEvent->GetCurrentTarget(getter_AddRefs(target)); - nsCOMPtr piTarget = do_QueryInterface(target); + nsCOMPtr receiver = do_QueryInterface(target); - mProtoHandler->ExecuteHandler(piTarget, aEvent); + mProtoHandler->ExecuteHandler(receiver, aEvent); return NS_OK; } @@ -135,7 +134,7 @@ nsXBLKeyEventHandler::HandleEvent(nsIDOMEvent* aEvent) nsCOMPtr target; aEvent->GetCurrentTarget(getter_AddRefs(target)); - nsCOMPtr piTarget = do_QueryInterface(target); + nsCOMPtr receiver = do_QueryInterface(target); nsCOMPtr key(do_QueryInterface(aEvent)); @@ -154,7 +153,7 @@ nsXBLKeyEventHandler::HandleEvent(nsIDOMEvent* aEvent) (hasAllowUntrustedAttr && handler->AllowUntrustedEvents()) || (!hasAllowUntrustedAttr && !mIsBoundToChrome)) && handler->KeyEventMatched(key)) { - handler->ExecuteHandler(piTarget, aEvent); + handler->ExecuteHandler(receiver, aEvent); } } diff --git a/content/xbl/src/nsXBLEventHandler.h b/content/xbl/src/nsXBLEventHandler.h index 1af7c093d5a8..ecd56f59b48b 100644 --- a/content/xbl/src/nsXBLEventHandler.h +++ b/content/xbl/src/nsXBLEventHandler.h @@ -46,7 +46,7 @@ class nsIAtom; class nsIContent; class nsIDOM3EventTarget; -class nsPIDOMEventTarget; +class nsIDOMEventReceiver; class nsXBLPrototypeHandler; class nsXBLEventHandler : public nsIDOMEventListener diff --git a/content/xbl/src/nsXBLPrototypeBinding.cpp b/content/xbl/src/nsXBLPrototypeBinding.cpp index 3d0f69b2b975..b5e2dc46e6f5 100644 --- a/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -43,7 +43,7 @@ #include "nsINameSpaceManager.h" #include "nsIURI.h" #include "nsIURL.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIChannel.h" #include "nsXPIDLString.h" #include "nsReadableUtils.h" diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp index 7fe05d6fa780..aaa907fcca95 100644 --- a/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -60,7 +60,7 @@ #include "nsIDOMText.h" #include "nsIFocusController.h" #include "nsIEventListenerManager.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMEventListener.h" #include "nsIPrivateDOMEvent.h" #include "nsIDOMNSEvent.h" @@ -212,7 +212,7 @@ nsXBLPrototypeHandler::InitAccessKeys() } nsresult -nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget, +nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsIDOMEvent* aEvent) { nsresult rv = NS_ERROR_FAILURE; @@ -273,14 +273,14 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget, nsCOMPtr controller; nsCOMPtr focusController; - nsCOMPtr windowRoot(do_QueryInterface(aTarget)); + nsCOMPtr windowRoot(do_QueryInterface(aReceiver)); if (windowRoot) { windowRoot->GetFocusController(getter_AddRefs(focusController)); } else { - nsCOMPtr privateWindow(do_QueryInterface(aTarget)); + nsCOMPtr privateWindow(do_QueryInterface(aReceiver)); if (!privateWindow) { - nsCOMPtr elt(do_QueryInterface(aTarget)); + nsCOMPtr elt(do_QueryInterface(aReceiver)); nsCOMPtr doc; // XXXbz sXBL/XBL2 issue -- this should be the "scope doc" or // something... whatever we use when wrapping DOM nodes @@ -290,7 +290,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget, doc = elt->GetOwnerDoc(); if (!doc) - doc = do_QueryInterface(aTarget); + doc = do_QueryInterface(aReceiver); if (!doc) return NS_ERROR_FAILURE; @@ -307,7 +307,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget, if (focusController) focusController->GetControllerForCommand(command.get(), getter_AddRefs(controller)); else - controller = GetController(aTarget); // We're attached to the receiver possibly. + controller = GetController(aReceiver); // We're attached to the receiver possibly. nsAutoString type; mEventName->ToString(type); @@ -418,7 +418,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget, // Compile the handler and bind it to the element. nsCOMPtr boundGlobal; - nsCOMPtr winRoot(do_QueryInterface(aTarget)); + nsCOMPtr winRoot(do_QueryInterface(aReceiver)); nsCOMPtr focusedWin; if (winRoot) { @@ -441,13 +441,13 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget, boundGlobal = do_QueryInterface(piWin->GetPrivateRoot()); } - else boundGlobal = do_QueryInterface(aTarget); + else boundGlobal = do_QueryInterface(aReceiver); if (!boundGlobal) { - nsCOMPtr boundDocument(do_QueryInterface(aTarget)); + nsCOMPtr boundDocument(do_QueryInterface(aReceiver)); if (!boundDocument) { // We must be an element. - nsCOMPtr content(do_QueryInterface(aTarget)); + nsCOMPtr content(do_QueryInterface(aReceiver)); if (!content) return NS_OK; boundDocument = content->GetOwnerDoc(); @@ -472,7 +472,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget, if (winRoot) { scriptTarget = boundGlobal; } else { - scriptTarget = aTarget; + scriptTarget = aReceiver; } // XXX - apparently we should not be using the global as the scope - what // should we use? See bug 339649, which is trying to find out! @@ -522,30 +522,30 @@ nsXBLPrototypeHandler::GetEventName() } already_AddRefed -nsXBLPrototypeHandler::GetController(nsPIDOMEventTarget* aTarget) +nsXBLPrototypeHandler::GetController(nsIDOMEventReceiver* aReceiver) { // XXX Fix this so there's a generic interface that describes controllers, // This code should have no special knowledge of what objects might have controllers. nsCOMPtr controllers; - nsCOMPtr xulElement(do_QueryInterface(aTarget)); + nsCOMPtr xulElement(do_QueryInterface(aReceiver)); if (xulElement) xulElement->GetControllers(getter_AddRefs(controllers)); if (!controllers) { - nsCOMPtr htmlTextArea(do_QueryInterface(aTarget)); + nsCOMPtr htmlTextArea(do_QueryInterface(aReceiver)); if (htmlTextArea) htmlTextArea->GetControllers(getter_AddRefs(controllers)); } if (!controllers) { - nsCOMPtr htmlInputElement(do_QueryInterface(aTarget)); + nsCOMPtr htmlInputElement(do_QueryInterface(aReceiver)); if (htmlInputElement) htmlInputElement->GetControllers(getter_AddRefs(controllers)); } if (!controllers) { - nsCOMPtr domWindow(do_QueryInterface(aTarget)); + nsCOMPtr domWindow(do_QueryInterface(aReceiver)); if (domWindow) domWindow->GetControllers(getter_AddRefs(controllers)); } diff --git a/content/xbl/src/nsXBLPrototypeHandler.h b/content/xbl/src/nsXBLPrototypeHandler.h index a46c15fb947c..9d98c992d70d 100644 --- a/content/xbl/src/nsXBLPrototypeHandler.h +++ b/content/xbl/src/nsXBLPrototypeHandler.h @@ -52,7 +52,7 @@ class nsIContent; class nsIDOMUIEvent; class nsIDOMKeyEvent; class nsIDOMMouseEvent; -class nsPIDOMEventTarget; +class nsIDOMEventReceiver; class nsIDOM3EventTarget; class nsXBLPrototypeBinding; @@ -121,7 +121,7 @@ public: nsXBLPrototypeHandler* GetNextHandler() { return mNextHandler; } void SetNextHandler(nsXBLPrototypeHandler* aHandler) { mNextHandler = aHandler; } - nsresult ExecuteHandler(nsPIDOMEventTarget* aTarget, nsIDOMEvent* aEvent); + nsresult ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsIDOMEvent* aEvent); already_AddRefed GetEventName(); void SetEventName(nsIAtom* aName) { mEventName = aName; } @@ -157,7 +157,7 @@ public: static PRUint32 gRefCnt; protected: - already_AddRefed GetController(nsPIDOMEventTarget* aTarget); + already_AddRefed GetController(nsIDOMEventReceiver* aReceiver); inline PRInt32 GetMatchingKeyCode(const nsAString& aKeyName); void ConstructPrototype(nsIContent* aKeyElement, diff --git a/content/xbl/src/nsXBLService.cpp b/content/xbl/src/nsXBLService.cpp index 38baa9b06c0a..30b4806fa069 100644 --- a/content/xbl/src/nsXBLService.cpp +++ b/content/xbl/src/nsXBLService.cpp @@ -429,8 +429,8 @@ nsXBLStreamListener::Load(nsIDOMEvent* aEvent) nsXBLBindingRequest::Destroy(mXBLService->mPool, req); } - nsCOMPtr target(do_QueryInterface(mBindingDocument)); - target->RemoveEventListener(NS_LITERAL_STRING("load"), (nsIDOMLoadListener*)this, PR_FALSE); + nsCOMPtr rec(do_QueryInterface(mBindingDocument)); + rec->RemoveEventListener(NS_LITERAL_STRING("load"), (nsIDOMLoadListener*)this, PR_FALSE); mBindingRequests.Clear(); mDocument = nsnull; @@ -707,34 +707,34 @@ nsXBLService::GetXBLDocumentInfo(nsIURI* aURI, nsIContent* aBoundElement) // then extra work needs to be done to hook it up to the document (XXX WHY??) // NS_IMETHODIMP -nsXBLService::AttachGlobalKeyHandler(nsPIDOMEventTarget* aTarget) +nsXBLService::AttachGlobalKeyHandler(nsIDOMEventReceiver* aReceiver) { // check if the receiver is a content node (not a document), and hook // it to the document if that is the case. - nsCOMPtr piTarget = aTarget; - nsCOMPtr contentNode(do_QueryInterface(aTarget)); + nsCOMPtr rec = aReceiver; + nsCOMPtr contentNode(do_QueryInterface(aReceiver)); if (contentNode) { // Only attach if we're really in a document nsCOMPtr doc = contentNode->GetCurrentDoc(); if (doc) - piTarget = do_QueryInterface(doc); // We're a XUL keyset. Attach to our document. + rec = do_QueryInterface(doc); // We're a XUL keyset. Attach to our document. } - if (!piTarget) + if (!rec) return NS_ERROR_FAILURE; nsCOMPtr elt(do_QueryInterface(contentNode)); // Create the key handler nsXBLWindowKeyHandler* handler; - NS_NewXBLWindowKeyHandler(elt, piTarget, &handler); // This addRef's + NS_NewXBLWindowKeyHandler(elt, rec, &handler); // This addRef's if (!handler) return NS_ERROR_FAILURE; // listen to these events nsCOMPtr systemGroup; - piTarget->GetSystemEventGroup(getter_AddRefs(systemGroup)); - nsCOMPtr target = do_QueryInterface(piTarget); + rec->GetSystemEventGroup(getter_AddRefs(systemGroup)); + nsCOMPtr target = do_QueryInterface(rec); target->AddGroupedEventListener(NS_LITERAL_STRING("keydown"), handler, PR_FALSE, systemGroup); @@ -1146,10 +1146,8 @@ nsXBLService::FetchBindingDocument(nsIContent* aBoundElement, nsIDocument* aBoun nsXBLStreamListener* xblListener = new nsXBLStreamListener(this, listener, aBoundDocument, doc); NS_ENSURE_TRUE(xblListener,NS_ERROR_OUT_OF_MEMORY); - nsCOMPtr target(do_QueryInterface(doc)); - target->AddEventListener(NS_LITERAL_STRING("load"), - NS_STATIC_CAST(nsIDOMLoadListener*, xblListener), - PR_FALSE); + nsCOMPtr rec(do_QueryInterface(doc)); + rec->AddEventListener(NS_LITERAL_STRING("load"), (nsIDOMLoadListener*)xblListener, PR_FALSE); // Add ourselves to the list of loading docs. nsBindingManager *bindingManager; diff --git a/content/xbl/src/nsXBLService.h b/content/xbl/src/nsXBLService.h index 35665fb7de27..9f11ca566c51 100644 --- a/content/xbl/src/nsXBLService.h +++ b/content/xbl/src/nsXBLService.h @@ -81,7 +81,7 @@ class nsXBLService : public nsIXBLService, PRBool aForceSyncLoad, nsIXBLDocumentInfo** aResult); // Used by XUL key bindings and for window XBL. - NS_IMETHOD AttachGlobalKeyHandler(nsPIDOMEventTarget* aTarget); + NS_IMETHOD AttachGlobalKeyHandler(nsIDOMEventReceiver* aElement); NS_DECL_NSIOBSERVER diff --git a/content/xbl/src/nsXBLWindowKeyHandler.cpp b/content/xbl/src/nsXBLWindowKeyHandler.cpp index fe75a1731d0e..acf9b96f105d 100644 --- a/content/xbl/src/nsXBLWindowKeyHandler.cpp +++ b/content/xbl/src/nsXBLWindowKeyHandler.cpp @@ -44,7 +44,7 @@ #include "nsIAtom.h" #include "nsIDOMNSUIEvent.h" #include "nsIDOMKeyEvent.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMNSEvent.h" #include "nsXBLService.h" #include "nsIServiceManager.h" @@ -175,9 +175,8 @@ nsXBLSpecialDocInfo::GetAllHandlers(const char* aType, nsXBLSpecialDocInfo* nsXBLWindowKeyHandler::sXBLSpecialDocInfo = nsnull; PRUint32 nsXBLWindowKeyHandler::sRefCnt = 0; -nsXBLWindowKeyHandler::nsXBLWindowKeyHandler(nsIDOMElement* aElement, - nsPIDOMEventTarget* aTarget) - : mTarget(aTarget), +nsXBLWindowKeyHandler::nsXBLWindowKeyHandler(nsIDOMElement* aElement, nsIDOMEventReceiver* aReceiver) + : mReceiver(aReceiver), mHandler(nsnull), mUserHandler(nsnull) { @@ -356,7 +355,7 @@ nsXBLWindowKeyHandler::WalkHandlers(nsIDOMEvent* aKeyEvent, nsIAtom* aEventType) // get the DOM window we're attached to nsCOMPtr controllers; - nsCOMPtr root = do_QueryInterface(mTarget); + nsCOMPtr root = do_QueryInterface(mReceiver); if (root) { nsCOMPtr fc; root->GetFocusController(getter_AddRefs(fc)); @@ -432,7 +431,7 @@ nsXBLWindowKeyHandler::ShutDown() PRBool nsXBLWindowKeyHandler::IsEditor() { - nsCOMPtr windowRoot(do_QueryInterface(mTarget)); + nsCOMPtr windowRoot(do_QueryInterface(mReceiver)); NS_ENSURE_TRUE(windowRoot, PR_FALSE); nsCOMPtr focusController; windowRoot->GetFocusController(getter_AddRefs(focusController)); @@ -535,15 +534,15 @@ nsXBLWindowKeyHandler::WalkHandlersInternal(nsIDOMEvent* aEvent, } } - nsCOMPtr piTarget; + nsCOMPtr rec; nsCOMPtr element = GetElement(); if (element) { - piTarget = do_QueryInterface(commandElt); + rec = do_QueryInterface(commandElt); } else { - piTarget = mTarget; + rec = mReceiver; } - rv = currHandler->ExecuteHandler(piTarget, aEvent); + rv = currHandler->ExecuteHandler(rec, aEvent); if (NS_SUCCEEDED(rv)) { return NS_OK; } @@ -564,10 +563,9 @@ nsXBLWindowKeyHandler::GetElement() /////////////////////////////////////////////////////////////////////////////////// nsresult -NS_NewXBLWindowKeyHandler(nsIDOMElement* aElement, nsPIDOMEventTarget* aTarget, - nsXBLWindowKeyHandler** aResult) +NS_NewXBLWindowKeyHandler(nsIDOMElement* aElement, nsIDOMEventReceiver* aReceiver, nsXBLWindowKeyHandler** aResult) { - *aResult = new nsXBLWindowKeyHandler(aElement, aTarget); + *aResult = new nsXBLWindowKeyHandler(aElement, aReceiver); if (!*aResult) return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(*aResult); diff --git a/content/xbl/src/nsXBLWindowKeyHandler.h b/content/xbl/src/nsXBLWindowKeyHandler.h index 2cf27153e63f..913b5b4c3a7e 100644 --- a/content/xbl/src/nsXBLWindowKeyHandler.h +++ b/content/xbl/src/nsXBLWindowKeyHandler.h @@ -45,8 +45,7 @@ class nsIAtom; class nsIDOMElement; -class nsIDOMEventTarget; -class nsPIDOMEventTarget; +class nsIDOMEventReceiver; class nsIXBLDocumentInfo; class nsXBLSpecialDocInfo; class nsXBLPrototypeHandler; @@ -54,7 +53,7 @@ class nsXBLPrototypeHandler; class nsXBLWindowKeyHandler : public nsIDOMKeyListener { public: - nsXBLWindowKeyHandler(nsIDOMElement* aElement, nsPIDOMEventTarget* aTarget); + nsXBLWindowKeyHandler(nsIDOMElement* aElement, nsIDOMEventReceiver* aReceiver); virtual ~nsXBLWindowKeyHandler(); // nsIDOMetc. @@ -96,7 +95,7 @@ protected: already_AddRefed GetElement(); // Using weak pointer to the DOM Element. nsWeakPtr mWeakPtrForElement; - nsPIDOMEventTarget* mTarget; // weak ref + nsIDOMEventReceiver* mReceiver; // weak ref // these are not owning references; the prototype handlers are owned // by the prototype bindings which are owned by the docinfo. @@ -110,7 +109,7 @@ protected: nsresult NS_NewXBLWindowKeyHandler(nsIDOMElement* aElement, - nsPIDOMEventTarget* aTarget, + nsIDOMEventReceiver* aReceiver, nsXBLWindowKeyHandler** aResult); #endif diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp index 170b48c9493c..38a4700d9000 100644 --- a/content/xul/content/src/nsXULElement.cpp +++ b/content/xul/content/src/nsXULElement.cpp @@ -77,7 +77,7 @@ #include "nsIDOMContextMenuListener.h" #include "nsIDOMDragListener.h" #include "nsIDOMEventListener.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMNodeList.h" #include "nsIDOMXULCommandDispatcher.h" #include "nsIDOMXULElement.h" @@ -523,11 +523,11 @@ nsXULElement::GetEventListenerManagerForAttr(nsIEventListenerManager** aManager, if ((!root || root == this) && !mNodeInfo->Equals(nsGkAtoms::overlay)) { nsPIDOMWindow *window = doc->GetInnerWindow(); - nsCOMPtr piTarget = do_QueryInterface(window); - if (!piTarget) + nsCOMPtr receiver = do_QueryInterface(window); + if (!receiver) return NS_ERROR_UNEXPECTED; - nsresult rv = piTarget->GetListenerManager(PR_TRUE, aManager); + nsresult rv = receiver->GetListenerManager(PR_TRUE, aManager); if (NS_SUCCEEDED(rv)) { NS_ADDREF(*aTarget = window); } diff --git a/content/xul/content/src/nsXULElement.h b/content/xul/content/src/nsXULElement.h index 5cf20babd3a4..20bc43e90fea 100644 --- a/content/xul/content/src/nsXULElement.h +++ b/content/xul/content/src/nsXULElement.h @@ -57,7 +57,7 @@ #include "nsIControllers.h" #include "nsICSSParser.h" #include "nsIDOMElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMXULElement.h" #include "nsIDOMXULMultSelectCntrlEl.h" diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index a9e5bb3ef89b..1890351f1ec1 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -1686,8 +1686,8 @@ nsXULDocument::AddElementToDocumentPost(nsIContent* 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); + nsCOMPtr rec(do_QueryInterface(aElement)); + xblService->AttachGlobalKeyHandler(rec); } } diff --git a/content/xul/document/src/nsXULDocument.h b/content/xul/document/src/nsXULDocument.h index 86ba5812880d..84ae26bd530b 100644 --- a/content/xul/document/src/nsXULDocument.h +++ b/content/xul/document/src/nsXULDocument.h @@ -49,7 +49,7 @@ #include "nsElementMap.h" #include "nsForwardReference.h" #include "nsIContent.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMXULCommandDispatcher.h" #include "nsIDOMXULDocument.h" #include "nsISupportsArray.h" diff --git a/dom/public/coreEvents/Makefile.in b/dom/public/coreEvents/Makefile.in index f34d74f499dd..ab61537bc28a 100644 --- a/dom/public/coreEvents/Makefile.in +++ b/dom/public/coreEvents/Makefile.in @@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom EXPORTS = \ + nsIDOMEventReceiver.h \ nsIDOMFocusListener.h \ nsIDOMFormListener.h \ nsIDOMKeyListener.h \ diff --git a/dom/public/coreEvents/nsIDOMEventReceiver.h b/dom/public/coreEvents/nsIDOMEventReceiver.h new file mode 100644 index 000000000000..722600aa9692 --- /dev/null +++ b/dom/public/coreEvents/nsIDOMEventReceiver.h @@ -0,0 +1,74 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef nsIDOMEventReceiver_h__ +#define nsIDOMEventReceiver_h__ + +#include "nsIDOMEventTarget.h" + +class nsIDOMEventListener; +class nsIEventListenerManager; +class nsIDOMEvent; +class nsIDOMEventGroup; + +/* + * DOM event source class. Object that allow event registration and + * distribution from themselves implement this interface. + */ + +/* 025957f3-7b19-452b-89a1-9be652d8d6db */ +#define NS_IDOMEVENTRECEIVER_IID \ +{ 0x025957f3, 0x7b19, 0x452b, \ + { 0x89, 0xa1, 0x9b, 0xe6, 0x52, 0xd8, 0xd6, 0xdb } } + +class nsIDOMEventReceiver : public nsIDOMEventTarget +{ +public: + NS_DECLARE_STATIC_IID_ACCESSOR(NS_IDOMEVENTRECEIVER_IID) + + NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID) = 0; + NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID) = 0; + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult) = 0; + NS_IMETHOD GetSystemEventGroup(nsIDOMEventGroup** aGroup) = 0; +}; + +NS_DEFINE_STATIC_IID_ACCESSOR(nsIDOMEventReceiver, NS_IDOMEVENTRECEIVER_IID) + +#endif // nsIDOMEventReceiver_h__ diff --git a/dom/src/base/nsDOMClassInfo.cpp b/dom/src/base/nsDOMClassInfo.cpp index 53e61d64962c..e73b1f8cd30d 100644 --- a/dom/src/base/nsDOMClassInfo.cpp +++ b/dom/src/base/nsDOMClassInfo.cpp @@ -168,7 +168,7 @@ // Event related includes #include "nsIEventListenerManager.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMNSEventTarget.h" // CSS related includes @@ -6706,15 +6706,18 @@ nsEventReceiverSH::RegisterCompileHandler(nsIXPConnectWrappedNative *wrapper, nsIScriptContext *script_cx = nsJSUtils::GetStaticScriptContext(cx, obj); NS_ENSURE_TRUE(script_cx, NS_ERROR_UNEXPECTED); - nsCOMPtr piTarget(do_QueryWrappedNative(wrapper)); - if (!piTarget) { + nsCOMPtr receiver(do_QueryWrappedNative(wrapper)); + if (!receiver) { // Doesn't do events - NS_WARNING("Doesn't QI to nsPIDOMEventTarget?"); +#ifdef DEBUG + nsCOMPtr attr = do_QueryWrappedNative(wrapper); + NS_WARN_IF_FALSE(attr, "Non-attr doesn't QI to nsIDOMEventReceiver?"); +#endif return NS_OK; } nsCOMPtr manager; - piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); + receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); NS_ENSURE_TRUE(manager, NS_ERROR_UNEXPECTED); nsCOMPtr atom(do_GetAtom(nsDependentJSString(id))); @@ -6725,12 +6728,12 @@ nsEventReceiverSH::RegisterCompileHandler(nsIXPConnectWrappedNative *wrapper, JSObject *scope = GetGlobalJSObject(cx, obj); if (compile) { - rv = manager->CompileScriptEventListener(script_cx, scope, piTarget, atom, + rv = manager->CompileScriptEventListener(script_cx, scope, receiver, atom, did_define); } else if (remove) { rv = manager->RemoveScriptEventListener(atom); } else { - rv = manager->RegisterScriptEventListener(script_cx, scope, piTarget, + rv = manager->RegisterScriptEventListener(script_cx, scope, receiver, atom); } diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp index 6903677bbf2f..883675352b17 100644 --- a/dom/src/base/nsGlobalWindow.cpp +++ b/dom/src/base/nsGlobalWindow.cpp @@ -698,6 +698,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow) NS_INTERFACE_MAP_ENTRY(nsIDOMJSWindow) NS_INTERFACE_MAP_ENTRY(nsIScriptGlobalObject) NS_INTERFACE_MAP_ENTRY(nsIScriptObjectPrincipal) + NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver) NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsIDOM3EventTarget) @@ -1292,9 +1293,9 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, if (internal == NS_STATIC_CAST(nsIDOMWindowInternal *, this)) { nsCOMPtr xblService = do_GetService("@mozilla.org/xbl;1"); if (xblService) { - nsCOMPtr piTarget = + nsCOMPtr rec = do_QueryInterface(mChromeEventHandler); - xblService->AttachGlobalKeyHandler(piTarget); + xblService->AttachGlobalKeyHandler(rec); } } } @@ -5566,7 +5567,12 @@ nsGlobalWindow::AddEventListener(const nsAString& aType, return manager->AddEventListenerByType(aListener, aType, flags, nsnull); } -nsresult + +//***************************************************************************** +// nsGlobalWindow::nsIDOMEventReceiver +//***************************************************************************** + +NS_IMETHODIMP nsGlobalWindow::AddEventListenerByIID(nsIDOMEventListener* aListener, const nsIID& aIID) { @@ -5579,7 +5585,7 @@ nsGlobalWindow::AddEventListenerByIID(nsIDOMEventListener* aListener, return NS_ERROR_FAILURE; } -nsresult +NS_IMETHODIMP nsGlobalWindow::RemoveEventListenerByIID(nsIDOMEventListener* aListener, const nsIID& aIID) { @@ -5594,7 +5600,7 @@ nsGlobalWindow::RemoveEventListenerByIID(nsIDOMEventListener* aListener, return NS_ERROR_FAILURE; } -nsresult +NS_IMETHODIMP nsGlobalWindow::GetListenerManager(PRBool aCreateIfNotFound, nsIEventListenerManager** aResult) { @@ -5613,7 +5619,7 @@ nsGlobalWindow::GetListenerManager(PRBool aCreateIfNotFound, mListenerManager = do_CreateInstance(kEventListenerManagerCID, &rv); NS_ENSURE_SUCCESS(rv, rv); mListenerManager->SetListenerTarget( - NS_STATIC_CAST(nsPIDOMEventTarget*, this)); + NS_STATIC_CAST(nsIDOMEventReceiver*, this)); } NS_ADDREF(*aResult = mListenerManager); @@ -5621,7 +5627,7 @@ nsGlobalWindow::GetListenerManager(PRBool aCreateIfNotFound, return NS_OK; } -nsresult +NS_IMETHODIMP nsGlobalWindow::GetSystemEventGroup(nsIDOMEventGroup **aGroup) { nsCOMPtr manager; diff --git a/dom/src/base/nsGlobalWindow.h b/dom/src/base/nsGlobalWindow.h index 40d32f2789c7..2c1d04389103 100644 --- a/dom/src/base/nsGlobalWindow.h +++ b/dom/src/base/nsGlobalWindow.h @@ -61,7 +61,7 @@ #include "nsIDocShellTreeItem.h" #include "nsIDOMClientInformation.h" #include "nsIDOMViewCSS.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMNSEventTarget.h" #include "nsIDOMNavigator.h" @@ -216,7 +216,7 @@ class nsGlobalWindow : public nsPIDOMWindow, public nsIScriptGlobalObject, public nsIDOMJSWindow, public nsIScriptObjectPrincipal, - public nsIDOMEventTarget, + public nsIDOMEventReceiver, public nsPIDOMEventTarget, public nsIDOM3EventTarget, public nsIDOMNSEventTarget, @@ -278,6 +278,15 @@ public: // nsIDOMNSEventTarget NS_DECL_NSIDOMNSEVENTTARGET + // nsIDOMEventReceiver + NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID); + NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener, + const nsIID& aIID); + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult); + NS_IMETHOD GetSystemEventGroup(nsIDOMEventGroup** aGroup); + // nsPIDOMWindow virtual NS_HIDDEN_(nsPIDOMWindow*) GetPrivateRoot(); virtual NS_HIDDEN_(nsresult) Activate(); @@ -312,13 +321,6 @@ public: nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - virtual NS_HIDDEN_(nsresult) GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult); - virtual NS_HIDDEN_(nsresult) AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual NS_HIDDEN_(nsresult) RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual NS_HIDDEN_(nsresult) GetSystemEventGroup(nsIDOMEventGroup** aGroup); virtual NS_HIDDEN_(void) SetDocShell(nsIDocShell* aDocShell); virtual NS_HIDDEN_(nsresult) SetNewDocument(nsIDocument *aDocument, diff --git a/dom/src/base/nsWindowRoot.cpp b/dom/src/base/nsWindowRoot.cpp index 531470a30b5b..46cd2464dfa6 100644 --- a/dom/src/base/nsWindowRoot.cpp +++ b/dom/src/base/nsWindowRoot.cpp @@ -67,10 +67,10 @@ nsWindowRoot::nsWindowRoot(nsIDOMWindow* aWindow) nsFocusController::Create(getter_AddRefs(mFocusController)); nsCOMPtr focusListener(do_QueryInterface(mFocusController)); - mRefCnt.incr(NS_STATIC_CAST(nsIDOMEventTarget*, this)); + mRefCnt.incr(NS_STATIC_CAST(nsIDOMEventReceiver*, this)); AddEventListener(NS_LITERAL_STRING("focus"), focusListener, PR_TRUE); AddEventListener(NS_LITERAL_STRING("blur"), focusListener, PR_TRUE); - mRefCnt.decr(NS_STATIC_CAST(nsIDOMEventTarget*, this)); + mRefCnt.decr(NS_STATIC_CAST(nsIDOMEventReceiver*, this)); } nsWindowRoot::~nsWindowRoot() @@ -83,7 +83,8 @@ nsWindowRoot::~nsWindowRoot() NS_IMPL_CYCLE_COLLECTION_2(nsWindowRoot, mListenerManager, mFocusController) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventTarget) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventReceiver) + NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver) NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsPIWindowRoot) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) @@ -183,7 +184,7 @@ nsWindowRoot::AddEventListener(const nsAString& aType, return manager->AddEventListenerByType(aListener, aType, flags, nsnull); } -nsresult +NS_IMETHODIMP nsWindowRoot::AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID) { nsCOMPtr manager; @@ -195,7 +196,7 @@ nsWindowRoot::AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& return NS_ERROR_FAILURE; } -nsresult +NS_IMETHODIMP nsWindowRoot::RemoveEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID) { nsCOMPtr manager; @@ -207,7 +208,7 @@ nsWindowRoot::RemoveEventListenerByIID(nsIDOMEventListener *aListener, const nsI return NS_ERROR_FAILURE; } -nsresult +NS_IMETHODIMP nsWindowRoot::GetListenerManager(PRBool aCreateIfNotFound, nsIEventListenerManager** aResult) { @@ -220,7 +221,7 @@ nsWindowRoot::GetListenerManager(PRBool aCreateIfNotFound, mListenerManager = do_CreateInstance(kEventListenerManagerCID, &rv); if (NS_FAILED(rv)) return rv; mListenerManager->SetListenerTarget( - NS_STATIC_CAST(nsPIDOMEventTarget*, this)); + NS_STATIC_CAST(nsIDOMEventReceiver*, this)); } *aResult = mListenerManager; @@ -228,7 +229,7 @@ nsWindowRoot::GetListenerManager(PRBool aCreateIfNotFound, return NS_OK; } -nsresult +NS_IMETHODIMP nsWindowRoot::GetSystemEventGroup(nsIDOMEventGroup **aGroup) { nsCOMPtr manager; diff --git a/dom/src/base/nsWindowRoot.h b/dom/src/base/nsWindowRoot.h index 145e0d8f1e96..37660db1634c 100644 --- a/dom/src/base/nsWindowRoot.h +++ b/dom/src/base/nsWindowRoot.h @@ -47,7 +47,7 @@ class nsIDOMEvent; class nsEventChainPreVisitor; class nsEventChainPostVisitor; -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMNSEventTarget.h" #include "nsIEventListenerManager.h" @@ -56,7 +56,7 @@ class nsEventChainPostVisitor; #include "nsIDOMEventTarget.h" #include "nsCycleCollectionParticipant.h" -class nsWindowRoot : public nsIDOMEventTarget, +class nsWindowRoot : public nsIDOMEventReceiver, public nsIDOM3EventTarget, public nsIDOMNSEventTarget, public nsPIWindowRoot @@ -76,18 +76,18 @@ public: nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - virtual nsresult GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult); - virtual nsresult AddEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult RemoveEventListenerByIID(nsIDOMEventListener *aListener, - const nsIID& aIID); - virtual nsresult GetSystemEventGroup(nsIDOMEventGroup** aGroup); + + // nsIDOMEventReceiver + NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID); + NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID); + NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, + nsIEventListenerManager** aResult); + NS_IMETHOD GetSystemEventGroup(nsIDOMEventGroup** aGroup); // nsPIWindowRoot NS_IMETHOD GetFocusController(nsIFocusController** aResult); - NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsWindowRoot, nsIDOMEventTarget) + NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsWindowRoot, nsIDOMEventReceiver) protected: // Members diff --git a/editor/libeditor/base/nsEditor.cpp b/editor/libeditor/base/nsEditor.cpp index 015b63434a40..3c70497fd9a5 100644 --- a/editor/libeditor/base/nsEditor.cpp +++ b/editor/libeditor/base/nsEditor.cpp @@ -43,8 +43,7 @@ #include "nsIDOMHTMLDocument.h" #include "nsIDOMHTMLElement.h" #include "nsIDOMNSHTMLElement.h" -#include "nsIDOMEventTarget.h" -#include "nsPIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIEventListenerManager.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" @@ -322,9 +321,9 @@ nsEditor::InstallEventListeners() mCompositionListenerP && mDragListenerP, NS_ERROR_NOT_INITIALIZED); - nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr erP = GetDOMEventReceiver(); - if (!piTarget) { + if (!erP) { RemoveEventListeners(); return NS_ERROR_FAILURE; } @@ -333,9 +332,9 @@ nsEditor::InstallEventListeners() // register the event listeners with the listener manager nsCOMPtr sysGroup; - piTarget->GetSystemEventGroup(getter_AddRefs(sysGroup)); + erP->GetSystemEventGroup(getter_AddRefs(sysGroup)); nsCOMPtr elmP; - piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(elmP)); + erP->GetListenerManager(PR_TRUE, getter_AddRefs(elmP)); if (sysGroup && elmP) { @@ -348,20 +347,20 @@ nsEditor::InstallEventListeners() "failed to register key listener in system group"); } - rv |= piTarget->AddEventListenerByIID(mMouseListenerP, - NS_GET_IID(nsIDOMMouseListener)); + rv |= erP->AddEventListenerByIID(mMouseListenerP, + NS_GET_IID(nsIDOMMouseListener)); - rv |= piTarget->AddEventListenerByIID(mFocusListenerP, - NS_GET_IID(nsIDOMFocusListener)); + rv |= erP->AddEventListenerByIID(mFocusListenerP, + NS_GET_IID(nsIDOMFocusListener)); - rv |= piTarget->AddEventListenerByIID(mTextListenerP, - NS_GET_IID(nsIDOMTextListener)); + rv |= erP->AddEventListenerByIID(mTextListenerP, + NS_GET_IID(nsIDOMTextListener)); - rv |= piTarget->AddEventListenerByIID(mCompositionListenerP, - NS_GET_IID(nsIDOMCompositionListener)); + rv |= erP->AddEventListenerByIID(mCompositionListenerP, + NS_GET_IID(nsIDOMCompositionListener)); - rv |= piTarget->AddEventListenerByIID(mDragListenerP, - NS_GET_IID(nsIDOMDragListener)); + rv |= erP->AddEventListenerByIID(mDragListenerP, + NS_GET_IID(nsIDOMDragListener)); if (NS_FAILED(rv)) { @@ -381,18 +380,18 @@ nsEditor::RemoveEventListeners() return; } - nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr erP = GetDOMEventReceiver(); - if (piTarget) + if (erP) { // unregister the event listeners with the DOM event reveiver if (mKeyListenerP) { nsCOMPtr sysGroup; - piTarget->GetSystemEventGroup(getter_AddRefs(sysGroup)); + erP->GetSystemEventGroup(getter_AddRefs(sysGroup)); nsCOMPtr elmP; - piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(elmP)); + erP->GetListenerManager(PR_TRUE, getter_AddRefs(elmP)); if (sysGroup && elmP) { elmP->RemoveEventListenerByType(mKeyListenerP, @@ -405,32 +404,32 @@ nsEditor::RemoveEventListeners() if (mMouseListenerP) { - piTarget->RemoveEventListenerByIID(mMouseListenerP, - NS_GET_IID(nsIDOMMouseListener)); + erP->RemoveEventListenerByIID(mMouseListenerP, + NS_GET_IID(nsIDOMMouseListener)); } if (mFocusListenerP) { - piTarget->RemoveEventListenerByIID(mFocusListenerP, - NS_GET_IID(nsIDOMFocusListener)); + erP->RemoveEventListenerByIID(mFocusListenerP, + NS_GET_IID(nsIDOMFocusListener)); } if (mTextListenerP) { - piTarget->RemoveEventListenerByIID(mTextListenerP, - NS_GET_IID(nsIDOMTextListener)); + erP->RemoveEventListenerByIID(mTextListenerP, + NS_GET_IID(nsIDOMTextListener)); } if (mCompositionListenerP) { - piTarget->RemoveEventListenerByIID(mCompositionListenerP, - NS_GET_IID(nsIDOMCompositionListener)); + erP->RemoveEventListenerByIID(mCompositionListenerP, + NS_GET_IID(nsIDOMCompositionListener)); } if (mDragListenerP) { - piTarget->RemoveEventListenerByIID(mDragListenerP, - NS_GET_IID(nsIDOMDragListener)); + erP->RemoveEventListenerByIID(mDragListenerP, + NS_GET_IID(nsIDOMDragListener)); } } } @@ -5209,14 +5208,14 @@ nsEditor::HandleInlineSpellCheck(PRInt32 action, aEndOffset) : NS_OK; } -already_AddRefed -nsEditor::GetPIDOMEventTarget() +already_AddRefed +nsEditor::GetDOMEventReceiver() { - nsPIDOMEventTarget* piTarget = mEventTarget; - if (piTarget) + nsIDOMEventReceiver *erp = mDOMEventReceiver; + if (erp) { - NS_ADDREF(piTarget); - return piTarget; + NS_ADDREF(erp); + return erp; } nsIDOMElement *rootElement = GetRoot(); @@ -5228,9 +5227,9 @@ nsEditor::GetPIDOMEventTarget() if (content && content->IsNativeAnonymous()) { - mEventTarget = do_QueryInterface(content->GetParent()); - piTarget = mEventTarget; - NS_IF_ADDREF(piTarget); + mDOMEventReceiver = do_QueryInterface(content->GetParent()); + erp = mDOMEventReceiver; + NS_IF_ADDREF(erp); } else { @@ -5239,7 +5238,7 @@ nsEditor::GetPIDOMEventTarget() // ourselves, if it exists. if (mDocWeak) { - CallQueryReferent(mDocWeak.get(), &piTarget); + CallQueryReferent(mDocWeak.get(), &erp); } else { @@ -5247,7 +5246,7 @@ nsEditor::GetPIDOMEventTarget() } } - return piTarget; + return erp; } nsIDOMElement * diff --git a/editor/libeditor/base/nsEditor.h b/editor/libeditor/base/nsEditor.h index 7ae51af8136a..9af675fdba1a 100644 --- a/editor/libeditor/base/nsEditor.h +++ b/editor/libeditor/base/nsEditor.h @@ -63,7 +63,6 @@ #include "nsSelectionState.h" #include "nsIEditorSpellCheck.h" #include "nsIInlineSpellChecker.h" -#include "nsPIDOMEventTarget.h" class nsIDOMCharacterData; class nsIDOMRange; @@ -84,7 +83,7 @@ class AddStyleSheetTxn; class RemoveStyleSheetTxn; class nsIFile; class nsISelectionController; -class nsIDOMEventTarget; +class nsIDOMEventReceiver; #define kMOZEditorBogusNodeAttr NS_LITERAL_STRING("_moz_editor_bogus_node") #define kMOZEditorBogusNodeValue NS_LITERAL_STRING("TRUE") @@ -575,7 +574,7 @@ public: nsIDOMNode *aEndNode, PRInt32 aEndOffset); - already_AddRefed GetPIDOMEventTarget(); + already_AddRefed GetDOMEventReceiver(); // Fast non-refcounting editor root element accessor nsIDOMElement *GetRoot(); @@ -635,7 +634,7 @@ protected: PRInt8 mDocDirtyState; // -1 = not initialized nsWeakPtr mDocWeak; // weak reference to the nsIDOMDocument // The form field as an event receiver - nsCOMPtr mEventTarget; + nsCOMPtr mDOMEventReceiver; nsString* mPhonetic; diff --git a/editor/libeditor/html/nsHTMLAbsPosition.cpp b/editor/libeditor/html/nsHTMLAbsPosition.cpp index dd4dde4d5603..7ca052d2b928 100644 --- a/editor/libeditor/html/nsHTMLAbsPosition.cpp +++ b/editor/libeditor/html/nsHTMLAbsPosition.cpp @@ -57,6 +57,7 @@ #include "nsIDOMNodeList.h" #include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" @@ -402,11 +403,11 @@ nsHTMLEditor::GrabberClicked() mMouseMotionListenerP = new ResizerMouseMotionListener(this); if (!mMouseMotionListenerP) {return NS_ERROR_NULL_POINTER;} - nsCOMPtr piTarget = GetPIDOMEventTarget(); - NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE); + nsCOMPtr erP = GetDOMEventReceiver(); + NS_ENSURE_TRUE(erP, NS_ERROR_FAILURE); - res = piTarget->AddEventListenerByIID(mMouseMotionListenerP, - NS_GET_IID(nsIDOMMouseMotionListener)); + res = erP->AddEventListenerByIID(mMouseMotionListenerP, + NS_GET_IID(nsIDOMMouseMotionListener)); NS_ASSERTION(NS_SUCCEEDED(res), "failed to register mouse motion listener"); } @@ -431,14 +432,13 @@ nsHTMLEditor::EndMoving() DeleteRefToAnonymousNode(mPositioningShadow, rootContent, ps); mPositioningShadow = nsnull; } - nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr erP = GetDOMEventReceiver(); - if (piTarget && mMouseMotionListenerP) { + if (erP && mMouseMotionListenerP) { #ifdef DEBUG nsresult res = #endif - piTarget->RemoveEventListenerByIID(mMouseMotionListenerP, - NS_GET_IID(nsIDOMMouseMotionListener)); + erP->RemoveEventListenerByIID(mMouseMotionListenerP, NS_GET_IID(nsIDOMMouseMotionListener)); NS_ASSERTION(NS_SUCCEEDED(res), "failed to remove mouse motion listener"); } mMouseMotionListenerP = nsnull; diff --git a/editor/libeditor/html/nsHTMLDataTransfer.cpp b/editor/libeditor/html/nsHTMLDataTransfer.cpp index 814c16ecaa2f..3d15f3087aca 100644 --- a/editor/libeditor/html/nsHTMLDataTransfer.cpp +++ b/editor/libeditor/html/nsHTMLDataTransfer.cpp @@ -51,7 +51,7 @@ #include "nsIDOMDocument.h" #include "nsIDOMAttr.h" #include "nsIDocument.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMNSEvent.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMKeyListener.h" diff --git a/editor/libeditor/html/nsHTMLEditor.cpp b/editor/libeditor/html/nsHTMLEditor.cpp index a78bdf4700ef..c7931dd22060 100644 --- a/editor/libeditor/html/nsHTMLEditor.cpp +++ b/editor/libeditor/html/nsHTMLEditor.cpp @@ -58,7 +58,7 @@ #include "nsIDOMDocument.h" #include "nsIDOMAttr.h" #include "nsIDocument.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMKeyListener.h" @@ -369,10 +369,9 @@ nsHTMLEditor::RemoveEventListeners() return; } - nsCOMPtr piTarget = GetPIDOMEventTarget(); - nsCOMPtr target = do_QueryInterface(piTarget); + nsCOMPtr erP = GetDOMEventReceiver(); - if (piTarget && target) + if (erP) { // Both mMouseMotionListenerP and mResizeEventListenerP can be // registerd with other targets than the DOM event receiver that @@ -385,17 +384,17 @@ nsHTMLEditor::RemoveEventListeners() { // mMouseMotionListenerP might be registerd either by IID or // name, unregister by both. - piTarget->RemoveEventListenerByIID(mMouseMotionListenerP, - NS_GET_IID(nsIDOMMouseMotionListener)); + erP->RemoveEventListenerByIID(mMouseMotionListenerP, + NS_GET_IID(nsIDOMMouseMotionListener)); - target->RemoveEventListener(NS_LITERAL_STRING("mousemove"), - mMouseMotionListenerP, PR_TRUE); + erP->RemoveEventListener(NS_LITERAL_STRING("mousemove"), + mMouseMotionListenerP, PR_TRUE); } if (mResizeEventListenerP) { - target->RemoveEventListener(NS_LITERAL_STRING("resize"), - mResizeEventListenerP, PR_FALSE); + erP->RemoveEventListener(NS_LITERAL_STRING("resize"), + mResizeEventListenerP, PR_FALSE); } } diff --git a/editor/libeditor/html/nsHTMLObjectResizer.cpp b/editor/libeditor/html/nsHTMLObjectResizer.cpp index be1e0377c0aa..9dddeb83f152 100644 --- a/editor/libeditor/html/nsHTMLObjectResizer.cpp +++ b/editor/libeditor/html/nsHTMLObjectResizer.cpp @@ -40,7 +40,7 @@ #include "nsIDOMEventTarget.h" #include "nsIDOMNSHTMLElement.h" -#include "nsPIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMText.h" #include "nsIDOMCSSValue.h" @@ -479,14 +479,12 @@ nsHTMLEditor::HideResizers(void) // don't forget to remove the listeners ! - nsCOMPtr piTarget = GetPIDOMEventTarget(); - nsCOMPtr target = do_QueryInterface(piTarget); + nsCOMPtr erP = GetDOMEventReceiver(); nsresult res; - if (target && mMouseMotionListenerP) + if (erP && mMouseMotionListenerP) { - res = target->RemoveEventListener(NS_LITERAL_STRING("mousemove"), - mMouseMotionListenerP, PR_TRUE); + res = erP->RemoveEventListener(NS_LITERAL_STRING("mousemove"), mMouseMotionListenerP, PR_TRUE); NS_ASSERTION(NS_SUCCEEDED(res), "failed to remove mouse motion listener"); } mMouseMotionListenerP = nsnull; @@ -495,7 +493,7 @@ nsHTMLEditor::HideResizers(void) GetDocument(getter_AddRefs(domDoc)); nsCOMPtr doc = do_QueryInterface(domDoc); if (!doc) { return NS_ERROR_NULL_POINTER; } - target = do_QueryInterface(doc->GetWindow()); + nsCOMPtr target = do_QueryInterface(doc->GetWindow()); if (!target) { return NS_ERROR_NULL_POINTER; } if (mResizeEventListenerP) { @@ -614,12 +612,11 @@ nsHTMLEditor::StartResizing(nsIDOMElement *aHandle) return NS_ERROR_OUT_OF_MEMORY; } - nsCOMPtr piTarget = GetPIDOMEventTarget(); - nsCOMPtr target = do_QueryInterface(piTarget); - NS_ENSURE_TRUE(target, NS_ERROR_FAILURE); + nsCOMPtr erP = GetDOMEventReceiver(); + NS_ENSURE_TRUE(erP, NS_ERROR_FAILURE); - result = target->AddEventListener(NS_LITERAL_STRING("mousemove"), - mMouseMotionListenerP, PR_TRUE); + result = erP->AddEventListener(NS_LITERAL_STRING("mousemove"), + mMouseMotionListenerP, PR_TRUE); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register mouse motion listener"); } diff --git a/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/editor/libeditor/text/nsPlaintextDataTransfer.cpp index f5c9476afb90..402f9b729e37 100644 --- a/editor/libeditor/text/nsPlaintextDataTransfer.cpp +++ b/editor/libeditor/text/nsPlaintextDataTransfer.cpp @@ -42,7 +42,7 @@ #include "nsIDocument.h" #include "nsIContent.h" #include "nsIFormControl.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMNSEvent.h" #include "nsIDOMMouseEvent.h" #include "nsISelection.h" diff --git a/editor/libeditor/text/nsPlaintextEditor.cpp b/editor/libeditor/text/nsPlaintextEditor.cpp index 912660154abb..21824147244b 100644 --- a/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/editor/libeditor/text/nsPlaintextEditor.cpp @@ -47,7 +47,7 @@ #include "nsIDOMNodeList.h" #include "nsIDOMDocument.h" #include "nsIDocument.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMMouseListener.h" diff --git a/embedding/browser/gtk/src/EmbedPrivate.cpp b/embedding/browser/gtk/src/EmbedPrivate.cpp index 761116b9ef86..8f769bb7572c 100644 --- a/embedding/browser/gtk/src/EmbedPrivate.cpp +++ b/embedding/browser/gtk/src/EmbedPrivate.cpp @@ -647,8 +647,8 @@ EmbedPrivate::Destroy(void) // detach our event listeners and release the event receiver DetachListeners(); - if (mEventTarget) - mEventTarget = nsnull; + if (mEventReceiver) + mEventReceiver = nsnull; // destroy our child window mWindow->ReleaseChildren(); @@ -993,7 +993,7 @@ EmbedPrivate::ContentStateChange(void) GetListener(); - if (!mEventTarget) + if (!mEventReceiver) return; AttachListeners(); @@ -1118,7 +1118,7 @@ EmbedPrivate::ChildFocusOut(void) void EmbedPrivate::GetListener(void) { - if (mEventTarget) + if (mEventReceiver) return; nsCOMPtr piWin; @@ -1127,7 +1127,7 @@ EmbedPrivate::GetListener(void) if (!piWin) return; - mEventTarget = do_QueryInterface(piWin->GetChromeEventHandler()); + mEventReceiver = do_QueryInterface(piWin->GetChromeEventHandler()); } // attach key and mouse event listeners @@ -1135,7 +1135,7 @@ EmbedPrivate::GetListener(void) void EmbedPrivate::AttachListeners(void) { - if (!mEventTarget || mListenersAttached) + if (!mEventReceiver || mListenersAttached) return; nsIDOMEventListener *eventListener = @@ -1144,7 +1144,7 @@ EmbedPrivate::AttachListeners(void) // add the key listener nsresult rv; - rv = mEventTarget->AddEventListenerByIID( + rv = mEventReceiver->AddEventListenerByIID( eventListener, NS_GET_IID(nsIDOMKeyListener)); if (NS_FAILED(rv)) { @@ -1152,7 +1152,7 @@ EmbedPrivate::AttachListeners(void) return; } - rv = mEventTarget->AddEventListenerByIID( + rv = mEventReceiver->AddEventListenerByIID( eventListener, NS_GET_IID(nsIDOMMouseListener)); if (NS_FAILED(rv)) { @@ -1160,7 +1160,7 @@ EmbedPrivate::AttachListeners(void) return; } - rv = mEventTarget->AddEventListenerByIID( + rv = mEventReceiver->AddEventListenerByIID( eventListener, NS_GET_IID(nsIDOMUIListener)); if (NS_FAILED(rv)) { @@ -1168,23 +1168,17 @@ EmbedPrivate::AttachListeners(void) return; } - rv = mEventTarget->AddEventListenerByIID( + rv = mEventReceiver->AddEventListenerByIID( eventListener, NS_GET_IID(nsIDOMMouseMotionListener)); if (NS_FAILED(rv)) { NS_WARNING("Failed to add Mouse Motion listener\n"); return; } - - nsCOMPtr target(do_QueryInterface(mEventTarget)); - if (!target) { - return; - } - - rv = target->AddEventListener(NS_LITERAL_STRING("focus"), eventListener, PR_TRUE); - rv = target->AddEventListener(NS_LITERAL_STRING("blur"), eventListener, PR_TRUE); - rv = target->AddEventListener(NS_LITERAL_STRING("DOMLinkAdded"), eventListener, PR_TRUE); - rv = target->AddEventListener(NS_LITERAL_STRING("load"), eventListener, PR_TRUE); + rv = mEventReceiver->AddEventListener(NS_LITERAL_STRING("focus"), eventListener, PR_TRUE); + rv = mEventReceiver->AddEventListener(NS_LITERAL_STRING("blur"), eventListener, PR_TRUE); + rv = mEventReceiver->AddEventListener(NS_LITERAL_STRING("DOMLinkAdded"), eventListener, PR_TRUE); + rv = mEventReceiver->AddEventListener(NS_LITERAL_STRING("load"), eventListener, PR_TRUE); if (NS_FAILED(rv)) { NS_WARNING("Failed to add Mouse Motion listener\n"); return; @@ -1196,7 +1190,7 @@ EmbedPrivate::AttachListeners(void) void EmbedPrivate::DetachListeners(void) { - if (!mListenersAttached || !mEventTarget) + if (!mListenersAttached || !mEventReceiver) return; nsIDOMEventListener *eventListener = @@ -1204,7 +1198,7 @@ EmbedPrivate::DetachListeners(void) NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener)); nsresult rv; - rv = mEventTarget->RemoveEventListenerByIID( + rv = mEventReceiver->RemoveEventListenerByIID( eventListener, NS_GET_IID(nsIDOMKeyListener)); if (NS_FAILED(rv)) { @@ -1213,7 +1207,7 @@ EmbedPrivate::DetachListeners(void) } rv = - mEventTarget->RemoveEventListenerByIID( + mEventReceiver->RemoveEventListenerByIID( eventListener, NS_GET_IID(nsIDOMMouseListener)); if (NS_FAILED(rv)) { @@ -1221,7 +1215,7 @@ EmbedPrivate::DetachListeners(void) return; } - rv = mEventTarget->RemoveEventListenerByIID( + rv = mEventReceiver->RemoveEventListenerByIID( eventListener, NS_GET_IID(nsIDOMUIListener)); if (NS_FAILED(rv)) { @@ -1229,23 +1223,17 @@ EmbedPrivate::DetachListeners(void) return; } - rv = mEventTarget->RemoveEventListenerByIID( + rv = mEventReceiver->RemoveEventListenerByIID( eventListener, NS_GET_IID(nsIDOMMouseMotionListener)); if (NS_FAILED(rv)) { NS_WARNING("Failed to remove Mouse Motion listener\n"); return; } - - nsCOMPtr target(do_QueryInterface(mEventTarget)); - if (!target) { - return; - } - - rv = target->RemoveEventListener(NS_LITERAL_STRING("focus"), eventListener, PR_TRUE); - rv = target->RemoveEventListener(NS_LITERAL_STRING("blur"), eventListener, PR_TRUE); - rv = target->RemoveEventListener(NS_LITERAL_STRING("DOMLinkAdded"), eventListener, PR_TRUE); - rv = target->RemoveEventListener(NS_LITERAL_STRING("load"), eventListener, PR_TRUE); + rv = mEventReceiver->RemoveEventListener(NS_LITERAL_STRING("focus"), eventListener, PR_TRUE); + rv = mEventReceiver->RemoveEventListener(NS_LITERAL_STRING("blur"), eventListener, PR_TRUE); + rv = mEventReceiver->RemoveEventListener(NS_LITERAL_STRING("DOMLinkAdded"), eventListener, PR_TRUE); + rv = mEventReceiver->RemoveEventListener(NS_LITERAL_STRING("load"), eventListener, PR_TRUE); mListenersAttached = PR_FALSE; } diff --git a/embedding/browser/gtk/src/EmbedPrivate.h b/embedding/browser/gtk/src/EmbedPrivate.h index 9e73a2b92a1d..ac0248b1d464 100644 --- a/embedding/browser/gtk/src/EmbedPrivate.h +++ b/embedding/browser/gtk/src/EmbedPrivate.h @@ -54,7 +54,7 @@ // object. #include "nsIWebBrowserChrome.h" #include "nsIAppShell.h" -#include "nsPIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsVoidArray.h" // app component registration @@ -190,7 +190,8 @@ class EmbedPrivate { nsCOMPtr mNavigation; nsCOMPtr mSessionHistory; - nsCOMPtr mEventTarget; + // our event receiver + nsCOMPtr mEventReceiver; // the currently loaded uri nsString mURI; diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index bfe4ba3bdf9a..e31c6dc4c81d 100644 --- a/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -71,7 +71,7 @@ #include "nsIDOMEvent.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMNSUIEvent.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMNamedNodeMap.h" #include "nsIDOMHTMLInputElement.h" #include "nsIDOMHTMLTextAreaElement.h" @@ -98,16 +98,15 @@ #include "nsPresContext.h" #include "nsIViewManager.h" #include "nsIView.h" -#include "nsPIDOMEventTarget.h" // // GetEventReceiver // // A helper routine that navigates the tricky path from a |nsWebBrowser| to -// a |nsPIDOMEventTarget| via the window root and chrome event handler. +// a |nsIDOMEventReceiver| via the window root and chrome event handler. // static nsresult -GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsPIDOMEventTarget** aTarget) +GetEventReceiver ( nsWebBrowser* inBrowser, nsIDOMEventReceiver** outEventRcvr ) { nsCOMPtr domWindow; inBrowser->GetContentDOMWindow(getter_AddRefs(domWindow)); @@ -117,11 +116,11 @@ GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsPIDOMEventTarget** aTarget) NS_ENSURE_TRUE(domWindowPrivate, NS_ERROR_FAILURE); nsPIDOMWindow *rootWindow = domWindowPrivate->GetPrivateRoot(); NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE); - nsCOMPtr piTarget = + nsCOMPtr rcvr = do_QueryInterface(rootWindow->GetChromeEventHandler()); - NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE); - *aTarget = piTarget; - NS_IF_ADDREF(*aTarget); + NS_ENSURE_TRUE(rcvr, NS_ERROR_FAILURE); + *outEventRcvr = rcvr; + NS_IF_ADDREF(*outEventRcvr); return NS_OK; } @@ -906,10 +905,10 @@ nsDocShellTreeOwner::AddChromeListeners() mChromeDragHandler = do_CreateInstance("@mozilla.org:/content/content-area-dragdrop;1", &rv); NS_ASSERTION(mChromeDragHandler, "Couldn't create the chrome drag handler"); if ( mChromeDragHandler ) { - nsCOMPtr piTarget; - GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget)); - nsCOMPtr target(do_QueryInterface(piTarget)); - mChromeDragHandler->HookupTo(target, NS_STATIC_CAST(nsIWebNavigation*, mWebBrowser)); + nsCOMPtr rcvr; + GetEventReceiver(mWebBrowser, getter_AddRefs(rcvr)); + nsCOMPtr rcvrTarget(do_QueryInterface(rcvr)); + mChromeDragHandler->HookupTo(rcvrTarget, NS_STATIC_CAST(nsIWebNavigation*, mWebBrowser)); } } @@ -1116,8 +1115,8 @@ ChromeTooltipListener::~ChromeTooltipListener() NS_IMETHODIMP ChromeTooltipListener::AddChromeListeners() { - if (!mEventTarget) - GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget)); + if ( !mEventReceiver ) + GetEventReceiver(mWebBrowser, getter_AddRefs(mEventReceiver)); // Register the appropriate events for tooltips, but only if // the embedding chrome cares. @@ -1144,11 +1143,11 @@ ChromeTooltipListener::AddChromeListeners() NS_IMETHODIMP ChromeTooltipListener::AddTooltipListener() { - if (mEventTarget) { + if (mEventReceiver) { nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this); - nsresult rv = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener)); - nsresult rv2 = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseMotionListener)); - nsresult rv3 = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMKeyListener)); + nsresult rv = mEventReceiver->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener)); + nsresult rv2 = mEventReceiver->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseMotionListener)); + nsresult rv3 = mEventReceiver->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMKeyListener)); // if all 3 succeed, we're a go! if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(rv2) && NS_SUCCEEDED(rv3)) @@ -1172,7 +1171,7 @@ ChromeTooltipListener::RemoveChromeListeners ( ) if ( mTooltipListenerInstalled ) RemoveTooltipListener(); - mEventTarget = nsnull; + mEventReceiver = nsnull; // it really doesn't matter if these fail... return NS_OK; @@ -1189,11 +1188,11 @@ ChromeTooltipListener::RemoveChromeListeners ( ) NS_IMETHODIMP ChromeTooltipListener::RemoveTooltipListener() { - if (mEventTarget) { + if (mEventReceiver) { nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this); - nsresult rv = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener)); - nsresult rv2 = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseMotionListener)); - nsresult rv3 = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMKeyListener)); + nsresult rv = mEventReceiver->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener)); + nsresult rv2 = mEventReceiver->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseMotionListener)); + nsresult rv3 = mEventReceiver->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMKeyListener)); if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(rv2) && NS_SUCCEEDED(rv3)) mTooltipListenerInstalled = PR_FALSE; } @@ -1569,9 +1568,9 @@ ChromeContextMenuListener::~ChromeContextMenuListener() NS_IMETHODIMP ChromeContextMenuListener::AddContextMenuListener() { - if (mEventTarget) { + if (mEventReceiver) { nsIDOMContextMenuListener *pListener = NS_STATIC_CAST(nsIDOMContextMenuListener *, this); - nsresult rv = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); + nsresult rv = mEventReceiver->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); if (NS_SUCCEEDED(rv)) mContextMenuListenerInstalled = PR_TRUE; } @@ -1588,9 +1587,9 @@ ChromeContextMenuListener::AddContextMenuListener() NS_IMETHODIMP ChromeContextMenuListener::RemoveContextMenuListener() { - if (mEventTarget) { + if (mEventReceiver) { nsIDOMContextMenuListener *pListener = NS_STATIC_CAST(nsIDOMContextMenuListener *, this); - nsresult rv = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); + nsresult rv = mEventReceiver->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); if (NS_SUCCEEDED(rv)) mContextMenuListenerInstalled = PR_FALSE; } @@ -1608,8 +1607,8 @@ ChromeContextMenuListener::RemoveContextMenuListener() NS_IMETHODIMP ChromeContextMenuListener::AddChromeListeners() { - if (!mEventTarget) - GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget)); + if ( !mEventReceiver ) + GetEventReceiver(mWebBrowser, getter_AddRefs(mEventReceiver)); // Register the appropriate events for context menus, but only if // the embedding chrome cares. @@ -1636,7 +1635,7 @@ ChromeContextMenuListener::RemoveChromeListeners() if ( mContextMenuListenerInstalled ) RemoveContextMenuListener(); - mEventTarget = nsnull; + mEventReceiver = nsnull; // it really doesn't matter if these fail... return NS_OK; diff --git a/embedding/browser/webBrowser/nsDocShellTreeOwner.h b/embedding/browser/webBrowser/nsDocShellTreeOwner.h index 3f9be54d1beb..f192dd382f40 100644 --- a/embedding/browser/webBrowser/nsDocShellTreeOwner.h +++ b/embedding/browser/webBrowser/nsDocShellTreeOwner.h @@ -52,7 +52,7 @@ #include "nsIWebBrowserChrome.h" #include "nsIDOMMouseListener.h" #include "nsIDOMDocument.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIEmbeddingSiteWindow.h" #include "nsIWebProgressListener.h" #include "nsWeakReference.h" @@ -66,7 +66,7 @@ #include "nsITooltipTextProvider.h" #include "nsCTooltipTextProvider.h" #include "nsIDragDropHandler.h" -#include "nsPIDOMEventTarget.h" + #include "nsCommandHandler.h" class nsWebBrowser; @@ -228,7 +228,7 @@ private: NS_IMETHOD HideTooltip ( ) ; nsWebBrowser* mWebBrowser; - nsCOMPtr mEventTarget; + nsCOMPtr mEventReceiver; nsCOMPtr mTooltipTextProvider; // This must be a strong ref in order to make sure we can hide the tooltip @@ -295,7 +295,7 @@ private: PRPackedBool mContextMenuListenerInstalled; nsWebBrowser* mWebBrowser; - nsCOMPtr mEventTarget; + nsCOMPtr mEventReceiver; nsCOMPtr mWebBrowserChrome; }; // class ChromeContextMenuListener diff --git a/extensions/python/dom/src/nsPyDOMModule.cpp b/extensions/python/dom/src/nsPyDOMModule.cpp index 7264982c2115..093298442c87 100644 --- a/extensions/python/dom/src/nsPyDOMModule.cpp +++ b/extensions/python/dom/src/nsPyDOMModule.cpp @@ -49,7 +49,7 @@ #include "nsIAtomService.h" #include "nsIEventListenerManager.h" #include "nsIScriptTimeoutHandler.h" -#include "nsPIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIArray.h" #include "jscntxt.h" #include "nsPIDOMWindow.h" @@ -303,11 +303,11 @@ static PyObject *PyAddScriptEventListener(PyObject *self, PyObject *args) return NULL; // The receiver, to get the manager. - nsCOMPtr piTarget(do_QueryInterface(target)); - if (!piTarget) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); + nsCOMPtr receiver(do_QueryInterface(target)); + if (!receiver) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); nsCOMPtr manager; - piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); + receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); if (!manager) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); // avoid do_GetAtom - its not part of the XPCOM glue. @@ -374,11 +374,11 @@ static PyObject *PyRegisterScriptEventListener(PyObject *self, PyObject *args) target = win->GetCurrentInnerWindow(); } // The receiver, to get the manager. - nsCOMPtr piTarget(do_QueryInterface(target)); - if (!piTarget) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); + nsCOMPtr receiver(do_QueryInterface(target)); + if (!receiver) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); nsCOMPtr manager; - piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); + receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); if (!manager) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); nsresult rv; @@ -445,11 +445,11 @@ static PyObject *PyCompileScriptEventListener(PyObject *self, PyObject *args) target = win->GetCurrentInnerWindow(); } // The receiver, to get the manager. - nsCOMPtr piTarget(do_QueryInterface(target)); - if (!piTarget) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); + nsCOMPtr receiver(do_QueryInterface(target)); + if (!receiver) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); nsCOMPtr manager; - piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); + receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); if (!manager) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); nsresult rv; diff --git a/extensions/python/dom/src/nsPyRuntime.cpp b/extensions/python/dom/src/nsPyRuntime.cpp index 692dab649fc6..23eebe822ee5 100644 --- a/extensions/python/dom/src/nsPyRuntime.cpp +++ b/extensions/python/dom/src/nsPyRuntime.cpp @@ -38,7 +38,7 @@ #include "nsPyContext.h" #include "nsICategoryManager.h" #include "nsIScriptContext.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" extern void init_nsdom(); diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp index 27848fcbb546..ca73573ac475 100644 --- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp +++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp @@ -73,8 +73,7 @@ #include "nsIDOMDocument.h" #include "nsIDOMDocumentRange.h" #include "nsIDOMElement.h" -#include "nsIDOMEventTarget.h" -#include "nsPIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMNode.h" #include "nsIDOMNodeList.h" @@ -623,13 +622,11 @@ mozInlineSpellChecker::RegisterEventListeners() nsresult rv = editor->GetDocument(getter_AddRefs(doc)); NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr piTarget = do_QueryInterface(doc, &rv); + nsCOMPtr eventReceiver = do_QueryInterface(doc, &rv); NS_ENSURE_SUCCESS(rv, rv); - piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), - NS_GET_IID(nsIDOMMouseListener)); - piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), - NS_GET_IID(nsIDOMKeyListener)); + eventReceiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), NS_GET_IID(nsIDOMMouseListener)); + eventReceiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), NS_GET_IID(nsIDOMKeyListener)); return NS_OK; } @@ -648,13 +645,11 @@ mozInlineSpellChecker::UnregisterEventListeners() editor->GetDocument(getter_AddRefs(doc)); NS_ENSURE_TRUE(doc, NS_ERROR_NULL_POINTER); - nsCOMPtr piTarget = do_QueryInterface(doc); - NS_ENSURE_TRUE(piTarget, NS_ERROR_NULL_POINTER); + nsCOMPtr eventReceiver = do_QueryInterface(doc); + NS_ENSURE_TRUE(eventReceiver, NS_ERROR_NULL_POINTER); - piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), - NS_GET_IID(nsIDOMMouseListener)); - piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), - NS_GET_IID(nsIDOMKeyListener)); + eventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), NS_GET_IID(nsIDOMMouseListener)); + eventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), NS_GET_IID(nsIDOMKeyListener)); return NS_OK; } diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index 7987486a1e9c..e43fb33bc68e 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -175,7 +175,7 @@ static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printset #include "nsIDocument.h" //focus -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMFocusListener.h" #include "nsISelectionController.h" @@ -750,13 +750,17 @@ DocumentViewerImpl::InitPresentationStuff(PRBool aDoInitialReflow) // mFocusListener is a strong reference mFocusListener = focusListener; - if (mDocument) { - rv = mDocument->AddEventListenerByIID(mFocusListener, - NS_GET_IID(nsIDOMFocusListener)); + // get the DOM event receiver + nsCOMPtr erP(do_QueryInterface(mDocument)); + NS_ASSERTION(erP, "No event receiver in document!"); + + if (erP) { + rv = erP->AddEventListenerByIID(mFocusListener, + NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener"); if (mOldFocusListener) { - rv = mDocument->RemoveEventListenerByIID(mOldFocusListener, - NS_GET_IID(nsIDOMFocusListener)); + rv = erP->RemoveEventListenerByIID(mOldFocusListener, + NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to remove focus listener"); } } @@ -1349,9 +1353,15 @@ DocumentViewerImpl::Open(nsISupports *aState, nsISHEntry *aSHEntry) SyncParentSubDocMap(); - if (mFocusListener && mDocument) { - mDocument->AddEventListenerByIID(mFocusListener, - NS_GET_IID(nsIDOMFocusListener)); + if (mFocusListener) { + // get the DOM event receiver + nsCOMPtr erP(do_QueryInterface(mDocument)); + NS_ASSERTION(erP, "No event receiver in document!"); + + if (erP) { + erP->AddEventListenerByIID(mFocusListener, + NS_GET_IID(nsIDOMFocusListener)); + } } // XXX re-enable image animations once that works correctly @@ -1405,9 +1415,15 @@ DocumentViewerImpl::Close(nsISHEntry *aSHEntry) mDocument->Destroy(); } - if (mFocusListener && mDocument) { - mDocument->RemoveEventListenerByIID(mFocusListener, - NS_GET_IID(nsIDOMFocusListener)); + if (mFocusListener) { + // get the DOM event receiver + nsCOMPtr erP(do_QueryInterface(mDocument)); + NS_ASSERTION(erP, "No event receiver in document!"); + + if (erP) { + erP->RemoveEventListenerByIID(mFocusListener, + NS_GET_IID(nsIDOMFocusListener)); + } } return NS_OK; @@ -1741,9 +1757,13 @@ DocumentViewerImpl::SetDOMDocument(nsIDOMDocument *aDocument) mPresShell->BeginObservingDocument(); // Register the focus listener on the new document - if (mDocument) { - rv = mDocument->AddEventListenerByIID(mFocusListener, - NS_GET_IID(nsIDOMFocusListener)); + + nsCOMPtr erP = do_QueryInterface(mDocument, &rv); + NS_ASSERTION(erP, "No event receiver in document!"); + + if (erP) { + rv = erP->AddEventListenerByIID(mFocusListener, + NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener"); } } diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index 0c00c1bbfb30..840110ad3c83 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -39,7 +39,7 @@ #include "nsCOMPtr.h" #include "nsReadableUtils.h" #include "nsComboboxControlFrame.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsFrameManager.h" #include "nsFormControlFrame.h" #include "nsGfxButtonControlFrame.h" @@ -1035,11 +1035,14 @@ nsComboboxControlFrame::CreateAnonymousContent(nsTArray& aElements) // make someone to listen to the button. If its pressed by someone like Accessibility // then open or close the combo box. - mButtonListener = new nsComboButtonListener(this); - if (!mButtonListener) - return NS_ERROR_OUT_OF_MEMORY; - mButtonContent->AddEventListenerByIID(mButtonListener, - NS_GET_IID(nsIDOMMouseListener)); + nsCOMPtr eventReceiver(do_QueryInterface(mButtonContent)); + if (eventReceiver) { + mButtonListener = new nsComboButtonListener(this); + if (!mButtonListener) + return NS_ERROR_OUT_OF_MEMORY; + eventReceiver->AddEventListenerByIID(mButtonListener, + NS_GET_IID(nsIDOMMouseListener)); + } mButtonContent->SetAttr(kNameSpaceID_None, nsGkAtoms::type, NS_LITERAL_STRING("button"), PR_FALSE); diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index 887e0eed0512..4f8ac1e70653 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -63,7 +63,7 @@ #include "nsIFilePicker.h" #include "nsIDOMMouseEvent.h" #include "nsINodeInfo.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsILocalFile.h" #include "nsIFileControlElement.h" #include "nsNodeInfoManager.h" @@ -116,13 +116,15 @@ nsFileControlFrame::Destroy() mTextFrame = nsnull; // remove mMouseListener as a mouse event listener (bug 40533, bug 355931) if (mBrowse) { - mBrowse->RemoveEventListenerByIID(mMouseListener, + nsCOMPtr receiver(do_QueryInterface(mBrowse)); + receiver->RemoveEventListenerByIID(mMouseListener, NS_GET_IID(nsIDOMMouseListener)); nsContentUtils::DestroyAnonymousContent(&mBrowse); } if (mTextContent) { - mTextContent->RemoveEventListenerByIID(mMouseListener, - NS_GET_IID(nsIDOMMouseListener)); + nsCOMPtr receiver(do_QueryInterface(mTextContent)); + receiver->RemoveEventListenerByIID(mMouseListener, + NS_GET_IID(nsIDOMMouseListener)); nsContentUtils::DestroyAnonymousContent(&mTextContent); } @@ -169,8 +171,9 @@ nsFileControlFrame::CreateAnonymousContent(nsTArray& aElements) return NS_ERROR_OUT_OF_MEMORY; // register as an event listener of the textbox to open file dialog on mouse click - mTextContent->AddEventListenerByIID(mMouseListener, - NS_GET_IID(nsIDOMMouseListener)); + nsCOMPtr receiver = do_QueryInterface(mTextContent); + receiver->AddEventListenerByIID(mMouseListener, + NS_GET_IID(nsIDOMMouseListener)); // Create the browse button NS_NewHTMLElement(getter_AddRefs(mBrowse), nodeInfo); @@ -195,8 +198,9 @@ nsFileControlFrame::CreateAnonymousContent(nsTArray& aElements) return NS_ERROR_OUT_OF_MEMORY; // register as an event listener of the button to open file dialog on mouse click - mBrowse->AddEventListenerByIID(mMouseListener, - NS_GET_IID(nsIDOMMouseListener)); + receiver = do_QueryInterface(mBrowse); + receiver->AddEventListenerByIID(mMouseListener, + NS_GET_IID(nsIDOMMouseListener)); SyncAttr(kNameSpaceID_None, nsGkAtoms::size, SYNC_TEXT); SyncAttr(kNameSpaceID_None, nsGkAtoms::disabled, SYNC_BOTH); diff --git a/layout/forms/nsIsIndexFrame.cpp b/layout/forms/nsIsIndexFrame.cpp index bc2959255a47..7b82180266bf 100644 --- a/layout/forms/nsIsIndexFrame.cpp +++ b/layout/forms/nsIsIndexFrame.cpp @@ -71,7 +71,7 @@ #include "nsIDOMKeyEvent.h" #include "nsIFormControlFrame.h" #include "nsINodeInfo.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsContentCID.h" #include "nsNodeInfoManager.h" #include "nsContentCreatorFunctions.h" @@ -98,7 +98,8 @@ nsIsIndexFrame::Destroy() { // remove ourself as a listener of the text control (bug 40533) if (mInputContent) { - mInputContent->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMKeyListener)); + nsCOMPtr receiver(do_QueryInterface(mInputContent)); + receiver->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMKeyListener)); nsContentUtils::DestroyAnonymousContent(&mInputContent); } nsContentUtils::DestroyAnonymousContent(&mTextContent); @@ -224,7 +225,8 @@ nsIsIndexFrame::CreateAnonymousContent(nsTArray& aElements) return NS_ERROR_OUT_OF_MEMORY; // Register as an event listener to submit on Enter press - mInputContent->AddEventListenerByIID(this, NS_GET_IID(nsIDOMKeyListener)); + nsCOMPtr receiver(do_QueryInterface(mInputContent)); + receiver->AddEventListenerByIID(this, NS_GET_IID(nsIDOMKeyListener)); // Create an hr NS_NewHTMLElement(getter_AddRefs(mPostHr), hrInfo); diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index ea52a80cd692..c9b680f882e4 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -60,7 +60,7 @@ #include "nsWidgetsCID.h" #include "nsIPresShell.h" #include "nsHTMLParts.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsEventDispatcher.h" #include "nsIEventStateManager.h" #include "nsIEventListenerManager.h" @@ -194,22 +194,22 @@ void nsListControlFrame::Destroy() { // get the receiver interface from the browser button's content node - ENSURE_TRUE(mContent); + nsCOMPtr receiver(do_QueryInterface(mContent)); // Clear the frame pointer on our event listener, just in case the // event listener can outlive the frame. mEventListener->SetFrame(nsnull); - mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, + receiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, mEventListener), NS_GET_IID(nsIDOMMouseListener)); - mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, + receiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, mEventListener), NS_GET_IID(nsIDOMMouseMotionListener)); - mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, + receiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, mEventListener), NS_GET_IID(nsIDOMKeyListener)); @@ -1113,7 +1113,7 @@ nsListControlFrame::Init(nsIContent* aContent, nsresult result = nsHTMLScrollFrame::Init(aContent, aParent, aPrevInFlow); // get the receiver interface from the browser button's content node - NS_ENSURE_STATE(mContent); + nsCOMPtr receiver(do_QueryInterface(mContent)); // we shouldn't have to unregister this listener because when // our frame goes away all these content node go away as well @@ -1123,15 +1123,15 @@ nsListControlFrame::Init(nsIContent* aContent, if (!mEventListener) return NS_ERROR_OUT_OF_MEMORY; - mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, + receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, mEventListener), NS_GET_IID(nsIDOMMouseListener)); - mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, + receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, mEventListener), NS_GET_IID(nsIDOMMouseMotionListener)); - mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, + receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, mEventListener), NS_GET_IID(nsIDOMKeyListener)); diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index 7d832ecf968f..0a5042ea5e02 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -84,7 +84,7 @@ #include "nsBoxLayoutState.h" //for keylistener for "return" check #include "nsIPrivateDOMEvent.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDocument.h" //observe documents to send onchangenotifications #include "nsIStyleSheet.h"//observe documents to send onchangenotifications #include "nsIStyleRule.h"//observe documents to send onchangenotifications @@ -1134,13 +1134,14 @@ nsTextControlFrame::PreDestroy() nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); if (mTextListener) { - if (mContent) + nsCOMPtr erP = do_QueryInterface(mContent); + if (erP) { - mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), NS_GET_IID(nsIDOMFocusListener)); + erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), NS_GET_IID(nsIDOMFocusListener)); } nsCOMPtr systemGroup; - mContent->GetSystemEventGroup(getter_AddRefs(systemGroup)); + erP->GetSystemEventGroup(getter_AddRefs(systemGroup)); nsCOMPtr dom3Targ = do_QueryInterface(mContent); if (dom3Targ) { // cast because of ambiguous base @@ -2731,10 +2732,10 @@ nsTextControlFrame::SetInitialChildList(nsIAtom* aListName, } //register focus and key listeners - if (mContent) { + nsCOMPtr erP = do_QueryInterface(mContent); + if (erP) { // register the event listeners with the DOM event receiver - rv = mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), - NS_GET_IID(nsIDOMFocusListener)); + rv = erP->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener"); // XXXbryner do we need to check for a null presshell here? if (!PresContext()->GetPresShell()) @@ -2742,7 +2743,7 @@ nsTextControlFrame::SetInitialChildList(nsIAtom* aListName, } nsCOMPtr systemGroup; - mContent->GetSystemEventGroup(getter_AddRefs(systemGroup)); + erP->GetSystemEventGroup(getter_AddRefs(systemGroup)); nsCOMPtr dom3Targ = do_QueryInterface(mContent); if (dom3Targ) { // cast because of ambiguous base diff --git a/layout/generic/nsImageMap.cpp b/layout/generic/nsImageMap.cpp index 537b00bf007f..269235b5b6db 100644 --- a/layout/generic/nsImageMap.cpp +++ b/layout/generic/nsImageMap.cpp @@ -57,7 +57,7 @@ #include "nsIDocument.h" #include "nsINameSpaceManager.h" #include "nsGkAtoms.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIPresShell.h" #include "nsIFrame.h" #include "nsFrameManager.h" @@ -753,7 +753,10 @@ nsImageMap::FreeAreas() nsCOMPtr areaContent; area->GetArea(getter_AddRefs(areaContent)); if (areaContent) { - areaContent->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMFocusListener)); + nsCOMPtr rec(do_QueryInterface(areaContent)); + if (rec) { + rec->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMFocusListener)); + } } delete area; } @@ -875,7 +878,10 @@ nsImageMap::AddArea(nsIContent* aArea) return NS_ERROR_OUT_OF_MEMORY; //Add focus listener to track area focus changes - aArea->AddEventListenerByIID(this, NS_GET_IID(nsIDOMFocusListener)); + nsCOMPtr rec(do_QueryInterface(aArea)); + if (rec) { + rec->AddEventListenerByIID(this, NS_GET_IID(nsIDOMFocusListener)); + } mPresShell->FrameManager()->SetPrimaryFrameFor(aArea, mImageFrame); aArea->SetMayHaveFrame(PR_TRUE); diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 54ff32457233..1ac71678ae0f 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -90,7 +90,7 @@ #include "nsIDOMFocusListener.h" #include "nsIDOMContextMenuListener.h" #include "nsIDOMDragListener.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMNSEvent.h" #include "nsIPrivateDOMEvent.h" #include "nsIDocumentEncoder.h" @@ -3103,32 +3103,32 @@ nsPluginInstanceOwner::Destroy() NS_RELEASE(mCXMenuListener); } - nsCOMPtr target(do_QueryInterface(mContent)); - if (target) { + nsCOMPtr receiver(do_QueryInterface(mContent)); + if (receiver) { nsCOMPtr listener; QueryInterface(NS_GET_IID(nsIDOMEventListener), getter_AddRefs(listener)); // Unregister focus event listener - mContent->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMFocusListener)); + receiver->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMFocusListener)); // Unregister mouse event listener - mContent->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseListener)); + receiver->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseListener)); // now for the mouse motion listener - mContent->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseMotionListener)); + receiver->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseMotionListener)); // Unregister key event listener; - target->RemoveEventListener(NS_LITERAL_STRING("keypress"), listener, PR_TRUE); - target->RemoveEventListener(NS_LITERAL_STRING("keydown"), listener, PR_TRUE); - target->RemoveEventListener(NS_LITERAL_STRING("keyup"), listener, PR_TRUE); + receiver->RemoveEventListener(NS_LITERAL_STRING("keypress"), listener, PR_TRUE); + receiver->RemoveEventListener(NS_LITERAL_STRING("keydown"), listener, PR_TRUE); + receiver->RemoveEventListener(NS_LITERAL_STRING("keyup"), listener, PR_TRUE); // Unregister drag event listener; - target->RemoveEventListener(NS_LITERAL_STRING("dragdrop"), listener, PR_TRUE); - target->RemoveEventListener(NS_LITERAL_STRING("dragover"), listener, PR_TRUE); - target->RemoveEventListener(NS_LITERAL_STRING("dragexit"), listener, PR_TRUE); - target->RemoveEventListener(NS_LITERAL_STRING("dragenter"), listener, PR_TRUE); - target->RemoveEventListener(NS_LITERAL_STRING("draggesture"), listener, PR_TRUE); + receiver->RemoveEventListener(NS_LITERAL_STRING("dragdrop"), listener, PR_TRUE); + receiver->RemoveEventListener(NS_LITERAL_STRING("dragover"), listener, PR_TRUE); + receiver->RemoveEventListener(NS_LITERAL_STRING("dragexit"), listener, PR_TRUE); + receiver->RemoveEventListener(NS_LITERAL_STRING("dragenter"), listener, PR_TRUE); + receiver->RemoveEventListener(NS_LITERAL_STRING("draggesture"), listener, PR_TRUE); } // Unregister scroll position listener @@ -3290,32 +3290,32 @@ nsresult nsPluginInstanceOwner::Init(nsPresContext* aPresContext, mCXMenuListener->Init(aContent); } - nsCOMPtr target(do_QueryInterface(mContent)); - if (target) { + nsCOMPtr receiver(do_QueryInterface(mContent)); + if (receiver) { nsCOMPtr listener; QueryInterface(NS_GET_IID(nsIDOMEventListener), getter_AddRefs(listener)); // Register focus listener - mContent->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMFocusListener)); + receiver->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMFocusListener)); // Register mouse listener - mContent->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseListener)); + receiver->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseListener)); // now do the mouse motion listener - mContent->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseMotionListener)); + receiver->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseMotionListener)); // Register key listener - target->AddEventListener(NS_LITERAL_STRING("keypress"), listener, PR_TRUE); - target->AddEventListener(NS_LITERAL_STRING("keydown"), listener, PR_TRUE); - target->AddEventListener(NS_LITERAL_STRING("keyup"), listener, PR_TRUE); + receiver->AddEventListener(NS_LITERAL_STRING("keypress"), listener, PR_TRUE); + receiver->AddEventListener(NS_LITERAL_STRING("keydown"), listener, PR_TRUE); + receiver->AddEventListener(NS_LITERAL_STRING("keyup"), listener, PR_TRUE); // Register drag listener - target->AddEventListener(NS_LITERAL_STRING("dragdrop"), listener, PR_TRUE); - target->AddEventListener(NS_LITERAL_STRING("dragover"), listener, PR_TRUE); - target->AddEventListener(NS_LITERAL_STRING("dragexit"), listener, PR_TRUE); - target->AddEventListener(NS_LITERAL_STRING("dragenter"), listener, PR_TRUE); - target->AddEventListener(NS_LITERAL_STRING("draggesture"), listener, PR_TRUE); + receiver->AddEventListener(NS_LITERAL_STRING("dragdrop"), listener, PR_TRUE); + receiver->AddEventListener(NS_LITERAL_STRING("dragover"), listener, PR_TRUE); + receiver->AddEventListener(NS_LITERAL_STRING("dragexit"), listener, PR_TRUE); + receiver->AddEventListener(NS_LITERAL_STRING("dragenter"), listener, PR_TRUE); + receiver->AddEventListener(NS_LITERAL_STRING("draggesture"), listener, PR_TRUE); } // Register scroll position listener diff --git a/layout/mathml/base/src/nsMathMLmactionFrame.cpp b/layout/mathml/base/src/nsMathMLmactionFrame.cpp index f5a1373dccbb..cc549d86d0b9 100644 --- a/layout/mathml/base/src/nsMathMLmactionFrame.cpp +++ b/layout/mathml/base/src/nsMathMLmactionFrame.cpp @@ -56,7 +56,7 @@ #include "nsIInterfaceRequestorUtils.h" #include "nsIDOMElement.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMMouseListener.h" #include "nsMathMLmactionFrame.h" @@ -88,8 +88,9 @@ NS_NewMathMLmactionFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) nsMathMLmactionFrame::~nsMathMLmactionFrame() { // unregister us as a mouse event listener ... - // printf("maction:%p unregistering as mouse event listener ...\n", this); - mContent->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); +// printf("maction:%p unregistering as mouse event listener ...\n", this); + nsCOMPtr receiver(do_QueryInterface(mContent)); + receiver->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); } NS_IMETHODIMP @@ -238,7 +239,8 @@ nsMathMLmactionFrame::SetInitialChildList(nsIAtom* aListName, else { // register us as a mouse event listener ... // printf("maction:%p registering as mouse event listener ...\n", this); - mContent->AddEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); + nsCOMPtr receiver(do_QueryInterface(mContent)); + receiver->AddEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); } return rv; } diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp index 37b12dd6a509..57f48e641727 100644 --- a/layout/printing/nsPrintEngine.cpp +++ b/layout/printing/nsPrintEngine.cpp @@ -99,7 +99,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro #include "nsIDocument.h" // Focus -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMFocusListener.h" #include "nsISelectionController.h" diff --git a/layout/xul/base/src/nsListBoxBodyFrame.cpp b/layout/xul/base/src/nsListBoxBodyFrame.cpp index 32b9a97a0098..ce8560c3cc9e 100644 --- a/layout/xul/base/src/nsListBoxBodyFrame.cpp +++ b/layout/xul/base/src/nsListBoxBodyFrame.cpp @@ -49,7 +49,7 @@ #include "nsIContent.h" #include "nsINameSpaceManager.h" #include "nsIDocument.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMElement.h" #include "nsIDOMNodeList.h" diff --git a/layout/xul/base/src/nsMenuBarFrame.cpp b/layout/xul/base/src/nsMenuBarFrame.cpp index f0b3a31229b2..18b33d6f5b81 100644 --- a/layout/xul/base/src/nsMenuBarFrame.cpp +++ b/layout/xul/base/src/nsMenuBarFrame.cpp @@ -49,7 +49,7 @@ #include "nsCSSRendering.h" #include "nsINameSpaceManager.h" #include "nsIDocument.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsGkAtoms.h" #include "nsMenuFrame.h" #include "nsMenuPopupFrame.h" @@ -139,7 +139,7 @@ nsMenuBarFrame::Init(nsIContent* aContent, // Hook up the menu bar as a key listener on the whole document. It will see every // key press that occurs, but after everyone else does. - nsCOMPtr target = do_QueryInterface(aContent->GetDocument()); + nsCOMPtr target = do_QueryInterface(aContent->GetDocument()); mTarget = target; diff --git a/layout/xul/base/src/nsMenuBarFrame.h b/layout/xul/base/src/nsMenuBarFrame.h index 2089d1e2922e..f31c234973be 100644 --- a/layout/xul/base/src/nsMenuBarFrame.h +++ b/layout/xul/base/src/nsMenuBarFrame.h @@ -156,7 +156,7 @@ protected: // if nothing has happened since the last click. Otherwise, contains nsnull. nsIMenuFrame* mRecentRollupMenu; - nsIDOMEventTarget* mTarget; + nsIDOMEventReceiver* mTarget; private: PRBool mCaretWasVisible; diff --git a/layout/xul/base/src/nsMenuBarListener.cpp b/layout/xul/base/src/nsMenuBarListener.cpp index 7e042f3a7b86..83e229076232 100644 --- a/layout/xul/base/src/nsMenuBarListener.cpp +++ b/layout/xul/base/src/nsMenuBarListener.cpp @@ -41,7 +41,7 @@ #include "nsMenuBarListener.h" #include "nsMenuBarFrame.h" #include "nsIDOMKeyListener.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMEventListener.h" #include "nsIDOMNSUIEvent.h" #include "nsIDOMNSEvent.h" diff --git a/layout/xul/base/src/nsMenuBarListener.h b/layout/xul/base/src/nsMenuBarListener.h index bce41f8c7b77..957eb025872d 100644 --- a/layout/xul/base/src/nsMenuBarListener.h +++ b/layout/xul/base/src/nsMenuBarListener.h @@ -42,7 +42,7 @@ #include "nsIDOMMouseListener.h" #include "nsIDOMKeyListener.h" #include "nsIDOMFocusListener.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" class nsMenuBarFrame; class nsPresContext; diff --git a/layout/xul/base/src/nsMenuDismissalListener.h b/layout/xul/base/src/nsMenuDismissalListener.h index b89b2ea17d8a..1c2313fc7a5d 100644 --- a/layout/xul/base/src/nsMenuDismissalListener.h +++ b/layout/xul/base/src/nsMenuDismissalListener.h @@ -42,7 +42,7 @@ #include "nsIDOMMouseListener.h" #include "nsIRollupListener.h" #include "nsIMenuRollup.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsCOMPtr.h" class nsIMenuParent; diff --git a/layout/xul/base/src/nsMenuListener.cpp b/layout/xul/base/src/nsMenuListener.cpp index ecb2f15cd1e1..ab5a06c955b9 100644 --- a/layout/xul/base/src/nsMenuListener.cpp +++ b/layout/xul/base/src/nsMenuListener.cpp @@ -41,7 +41,7 @@ #include "nsMenuListener.h" #include "nsMenuBarFrame.h" #include "nsIDOMKeyListener.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMEventListener.h" #include "nsIDOMNSUIEvent.h" #include "nsGUIEvent.h" diff --git a/layout/xul/base/src/nsMenuListener.h b/layout/xul/base/src/nsMenuListener.h index 282d68b77e4a..91ddc7c6f1bc 100644 --- a/layout/xul/base/src/nsMenuListener.h +++ b/layout/xul/base/src/nsMenuListener.h @@ -41,7 +41,7 @@ #include "nsIDOMMouseListener.h" #include "nsIDOMKeyListener.h" #include "nsIDOMFocusListener.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" class nsIMenuParent; class nsPresContext; diff --git a/layout/xul/base/src/nsMenuPopupFrame.cpp b/layout/xul/base/src/nsMenuPopupFrame.cpp index 3ee9c9311007..4708db528f82 100644 --- a/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -1786,7 +1786,7 @@ nsMenuPopupFrame::InstallKeyboardNavigator() if (mKeyboardNavigator) return NS_OK; - nsCOMPtr target = do_QueryInterface(mContent->GetDocument()); + nsCOMPtr target = do_QueryInterface(mContent->GetDocument()); mTarget = target; mKeyboardNavigator = new nsMenuListener(this); diff --git a/layout/xul/base/src/nsMenuPopupFrame.h b/layout/xul/base/src/nsMenuPopupFrame.h index 717d593040d1..896833f3532b 100644 --- a/layout/xul/base/src/nsMenuPopupFrame.h +++ b/layout/xul/base/src/nsMenuPopupFrame.h @@ -48,7 +48,7 @@ #include "prtypes.h" #include "nsIAtom.h" #include "nsCOMPtr.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsMenuListener.h" #include "nsBoxFrame.h" @@ -242,7 +242,7 @@ protected: nsIMenuFrame* mCurrentMenu; // The current menu that is active. nsMenuListener* mKeyboardNavigator; // The listener that tells us about key events. - nsIDOMEventTarget* mTarget; + nsIDOMEventReceiver* mTarget; nsIMenuFrame* mTimerMenu; // A menu awaiting closure. nsCOMPtr mCloseTimer; // Close timer. diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/base/src/nsSliderFrame.cpp index 32402d02e474..a1bb798f80f1 100644 --- a/layout/xul/base/src/nsSliderFrame.cpp +++ b/layout/xul/base/src/nsSliderFrame.cpp @@ -54,7 +54,7 @@ #include "nsHTMLParts.h" #include "nsIPresShell.h" #include "nsCSSRendering.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIViewManager.h" #include "nsIWidget.h" #include "nsIDOMMouseEvent.h" @@ -963,8 +963,10 @@ nsSliderFrame::AddListener() nsIFrame* thumbFrame = mFrames.FirstChild(); if (thumbFrame) { - thumbFrame->GetContent()-> - AddEventListenerByIID(mMediator, NS_GET_IID(nsIDOMMouseListener)); + nsCOMPtr + receiver(do_QueryInterface(thumbFrame->GetContent())); + + receiver->AddEventListenerByIID(mMediator, NS_GET_IID(nsIDOMMouseListener)); } } @@ -977,8 +979,10 @@ nsSliderFrame::RemoveListener() if (!thumbFrame) return; - thumbFrame->GetContent()-> - RemoveEventListenerByIID(mMediator, NS_GET_IID(nsIDOMMouseListener)); + nsCOMPtr + receiver(do_QueryInterface(thumbFrame->GetContent())); + + receiver->RemoveEventListenerByIID(mMediator, NS_GET_IID(nsIDOMMouseListener)); } NS_IMETHODIMP diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/base/src/nsSplitterFrame.cpp index 24f5f988ee36..476224489a37 100644 --- a/layout/xul/base/src/nsSplitterFrame.cpp +++ b/layout/xul/base/src/nsSplitterFrame.cpp @@ -55,7 +55,7 @@ #include "nsScrollbarButtonFrame.h" #include "nsIDOMMouseListener.h" #include "nsIDOMMouseMotionListener.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsIScrollableView.h" @@ -618,23 +618,21 @@ nsSplitterFrameInner::MouseDrag(nsPresContext* aPresContext, nsGUIEvent* aEvent) void nsSplitterFrameInner::AddListener(nsPresContext* aPresContext) { - mOuter->GetContent()-> - AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,this), - NS_GET_IID(nsIDOMMouseListener)); - mOuter->GetContent()-> - AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,this), - NS_GET_IID(nsIDOMMouseMotionListener)); + nsCOMPtr + receiver(do_QueryInterface(mOuter->GetContent())); + + receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,this), NS_GET_IID(nsIDOMMouseListener)); + receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,this), NS_GET_IID(nsIDOMMouseMotionListener)); } void nsSplitterFrameInner::RemoveListener() { - mOuter->GetContent()-> - RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,this), - NS_GET_IID(nsIDOMMouseListener)); - mOuter->GetContent()-> - RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,this), - NS_GET_IID(nsIDOMMouseMotionListener)); + nsCOMPtr + receiver(do_QueryInterface(mOuter->GetContent())); + + receiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,this),NS_GET_IID(nsIDOMMouseListener)); + receiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,this),NS_GET_IID(nsIDOMMouseMotionListener)); } /* diff --git a/widget/src/cocoa/nsMenuItemX.mm b/widget/src/cocoa/nsMenuItemX.mm index 55fd141562b1..e8f1f0f6cd23 100644 --- a/widget/src/cocoa/nsMenuItemX.mm +++ b/widget/src/cocoa/nsMenuItemX.mm @@ -52,7 +52,7 @@ #include "nsIDocument.h" #include "nsIDOMDocument.h" #include "nsIPrivateDOMEvent.h" -#include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIDOMDocumentEvent.h" #include "nsMenuItemIconX.h" diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp index a822c4910b8b..43ef5adb0f35 100644 --- a/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/xpfe/appshell/src/nsWebShellWindow.cpp @@ -56,6 +56,7 @@ #include "nsEscape.h" #include "nsPIDOMWindow.h" #include "nsIDOMEventTarget.h" +#include "nsIDOMEventReceiver.h" #include "nsIPrivateDOMEvent.h" #include "nsIEventListenerManager.h" #include "nsIDOMFocusListener.h"