From 7a1f7182a14808637078ab45f60fccbd5156134d Mon Sep 17 00:00:00 2001 From: "Olli.Pettay%helsinki.fi" Date: Mon, 14 May 2007 09:13:09 +0000 Subject: [PATCH] Bug 363089, Remove nsIDOMEventReceiver (this time passes mochitest), r+sr=jst git-svn-id: svn://10.0.0.236/trunk@226373 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/src/browser/BrowserWrapper.mm | 6 +- mozilla/camino/src/embedding/CHBrowserView.mm | 8 +- .../base/src/nsContentAreaDragDrop.cpp | 22 ++-- .../content/base/src/nsContentAreaDragDrop.h | 4 +- mozilla/content/base/src/nsContentUtils.cpp | 7 +- mozilla/content/base/src/nsDOMAttribute.cpp | 38 +++++- mozilla/content/base/src/nsDOMAttribute.h | 9 +- mozilla/content/base/src/nsDOMParser.cpp | 3 +- mozilla/content/base/src/nsDocument.cpp | 9 +- mozilla/content/base/src/nsDocument.h | 19 ++- .../content/base/src/nsGenericDOMDataNode.cpp | 39 +++++- .../content/base/src/nsGenericDOMDataNode.h | 11 +- mozilla/content/base/src/nsGenericElement.cpp | 118 +++++++----------- mozilla/content/base/src/nsGenericElement.h | 23 ++-- .../content/base/src/nsSyncLoadService.cpp | 3 +- mozilla/content/base/src/nsXMLHttpRequest.cpp | 3 +- .../events/public/nsPIDOMEventTarget.h | 26 +++- .../content/events/src/nsEventDispatcher.cpp | 1 - .../events/src/nsEventListenerManager.cpp | 30 ----- .../events/src/nsEventListenerManager.h | 13 +- .../content/events/src/nsXMLEventsManager.cpp | 2 +- .../html/content/src/nsGenericHTMLElement.cpp | 7 +- .../html/content/src/nsHTMLAnchorElement.cpp | 2 +- .../html/content/src/nsHTMLAreaElement.cpp | 2 +- .../html/content/src/nsHTMLBRElement.cpp | 2 +- .../html/content/src/nsHTMLBodyElement.cpp | 2 +- .../html/content/src/nsHTMLButtonElement.cpp | 2 +- .../html/content/src/nsHTMLDelElement.cpp | 2 +- .../html/content/src/nsHTMLDivElement.cpp | 2 +- .../content/src/nsHTMLFieldSetElement.cpp | 2 +- .../html/content/src/nsHTMLFontElement.cpp | 2 +- .../html/content/src/nsHTMLFormElement.cpp | 2 +- .../content/src/nsHTMLFrameSetElement.cpp | 2 +- .../html/content/src/nsHTMLHRElement.cpp | 2 +- .../html/content/src/nsHTMLHeadElement.cpp | 2 +- .../html/content/src/nsHTMLHeadingElement.cpp | 2 +- .../html/content/src/nsHTMLHtmlElement.cpp | 2 +- .../html/content/src/nsHTMLImageElement.cpp | 2 +- .../html/content/src/nsHTMLInputElement.cpp | 4 +- .../html/content/src/nsHTMLLIElement.cpp | 2 +- .../html/content/src/nsHTMLLabelElement.cpp | 2 +- .../html/content/src/nsHTMLLegendElement.cpp | 2 +- .../html/content/src/nsHTMLLinkElement.cpp | 2 +- .../html/content/src/nsHTMLMapElement.cpp | 2 +- .../html/content/src/nsHTMLMetaElement.cpp | 2 +- .../html/content/src/nsHTMLOListElement.cpp | 2 +- .../content/src/nsHTMLOptGroupElement.cpp | 2 +- .../html/content/src/nsHTMLOptionElement.cpp | 2 +- .../content/src/nsHTMLParagraphElement.cpp | 2 +- .../html/content/src/nsHTMLPreElement.cpp | 2 +- .../html/content/src/nsHTMLScriptElement.cpp | 2 +- .../html/content/src/nsHTMLSelectElement.cpp | 2 +- .../html/content/src/nsHTMLSpanElement.cpp | 2 +- .../html/content/src/nsHTMLStyleElement.cpp | 2 +- .../content/src/nsHTMLTableCaptionElement.cpp | 2 +- .../content/src/nsHTMLTableCellElement.cpp | 2 +- .../content/src/nsHTMLTableColElement.cpp | 2 +- .../html/content/src/nsHTMLTableElement.cpp | 2 +- .../content/src/nsHTMLTableRowElement.cpp | 2 +- .../content/src/nsHTMLTableSectionElement.cpp | 2 +- .../content/src/nsHTMLTextAreaElement.cpp | 2 +- .../html/content/src/nsHTMLTitleElement.cpp | 2 +- .../content/svg/content/src/nsSVGElement.cpp | 2 +- mozilla/content/xbl/public/nsIXBLService.h | 8 +- mozilla/content/xbl/src/nsXBLBinding.cpp | 10 +- mozilla/content/xbl/src/nsXBLEventHandler.cpp | 11 +- mozilla/content/xbl/src/nsXBLEventHandler.h | 2 +- .../content/xbl/src/nsXBLPrototypeBinding.cpp | 2 +- .../content/xbl/src/nsXBLPrototypeHandler.cpp | 34 ++--- .../content/xbl/src/nsXBLPrototypeHandler.h | 6 +- mozilla/content/xbl/src/nsXBLService.cpp | 26 ++-- mozilla/content/xbl/src/nsXBLService.h | 2 +- .../content/xbl/src/nsXBLWindowKeyHandler.cpp | 24 ++-- .../content/xbl/src/nsXBLWindowKeyHandler.h | 9 +- .../content/xul/content/src/nsXULElement.cpp | 8 +- .../content/xul/content/src/nsXULElement.h | 2 +- .../xul/document/src/nsXULDocument.cpp | 4 +- .../content/xul/document/src/nsXULDocument.h | 2 +- mozilla/dom/public/coreEvents/Makefile.in | 1 - .../public/coreEvents/nsIDOMEventReceiver.h | 74 ----------- mozilla/dom/src/base/nsDOMClassInfo.cpp | 17 ++- mozilla/dom/src/base/nsGlobalWindow.cpp | 20 ++- mozilla/dom/src/base/nsGlobalWindow.h | 20 ++- mozilla/dom/src/base/nsWindowRoot.cpp | 17 ++- mozilla/dom/src/base/nsWindowRoot.h | 20 +-- mozilla/editor/libeditor/base/nsEditor.cpp | 81 ++++++------ mozilla/editor/libeditor/base/nsEditor.h | 7 +- .../libeditor/html/nsHTMLAbsPosition.cpp | 16 +-- .../libeditor/html/nsHTMLDataTransfer.cpp | 2 +- .../editor/libeditor/html/nsHTMLEditor.cpp | 19 +-- .../libeditor/html/nsHTMLObjectResizer.cpp | 21 ++-- .../text/nsPlaintextDataTransfer.cpp | 2 +- .../libeditor/text/nsPlaintextEditor.cpp | 2 +- .../browser/gtk/src/EmbedPrivate.cpp | 58 +++++---- .../embedding/browser/gtk/src/EmbedPrivate.h | 5 +- .../webBrowser/nsDocShellTreeOwner.cpp | 59 ++++----- .../browser/webBrowser/nsDocShellTreeOwner.h | 8 +- .../python/dom/src/nsPyDOMModule.cpp | 20 +-- .../extensions/python/dom/src/nsPyRuntime.cpp | 2 +- .../src/nsSpatialNavigationPrivate.h | 2 +- .../src/nsSpatialNavigationUtils.cpp | 9 +- .../spellcheck/src/mozInlineSpellChecker.cpp | 21 ++-- .../typeaheadfind/src/nsTypeAheadFind.cpp | 27 ++-- .../xforms/nsXFormsInstanceElement.cpp | 2 +- .../xforms/nsXFormsModelElement.cpp | 2 +- mozilla/layout/base/nsDocumentViewer.cpp | 50 +++----- .../layout/forms/nsComboboxControlFrame.cpp | 15 +-- mozilla/layout/forms/nsFileControlFrame.cpp | 20 ++- mozilla/layout/forms/nsIsIndexFrame.cpp | 8 +- mozilla/layout/forms/nsListControlFrame.cpp | 18 +-- mozilla/layout/forms/nsTextControlFrame.cpp | 17 ++- mozilla/layout/generic/nsImageMap.cpp | 12 +- mozilla/layout/generic/nsObjectFrame.cpp | 54 ++++---- .../mathml/base/src/nsMathMLmactionFrame.cpp | 10 +- mozilla/layout/printing/nsPrintEngine.cpp | 2 +- .../xul/base/src/nsListBoxBodyFrame.cpp | 2 +- .../layout/xul/base/src/nsMenuBarFrame.cpp | 4 +- mozilla/layout/xul/base/src/nsMenuBarFrame.h | 2 +- .../layout/xul/base/src/nsMenuBarListener.cpp | 2 +- .../layout/xul/base/src/nsMenuBarListener.h | 2 +- .../xul/base/src/nsMenuDismissalListener.h | 2 +- .../layout/xul/base/src/nsMenuListener.cpp | 2 +- mozilla/layout/xul/base/src/nsMenuListener.h | 2 +- .../layout/xul/base/src/nsMenuPopupFrame.cpp | 2 +- .../layout/xul/base/src/nsMenuPopupFrame.h | 4 +- mozilla/layout/xul/base/src/nsSliderFrame.cpp | 14 +-- .../layout/xul/base/src/nsSplitterFrame.cpp | 24 ++-- .../components/softkb/nsSoftKeyBoard.cpp | 25 ++-- mozilla/widget/src/cocoa/nsMenuItemX.mm | 2 +- mozilla/widget/src/mac/nsMenuItemX.cpp | 2 +- .../xpfe/appshell/src/nsWebShellWindow.cpp | 1 - 131 files changed, 689 insertions(+), 778 deletions(-) delete mode 100644 mozilla/dom/public/coreEvents/nsIDOMEventReceiver.h diff --git a/mozilla/camino/src/browser/BrowserWrapper.mm b/mozilla/camino/src/browser/BrowserWrapper.mm index 7175c966db9..aefb88eb46b 100644 --- a/mozilla/camino/src/browser/BrowserWrapper.mm +++ b/mozilla/camino/src/browser/BrowserWrapper.mm @@ -77,7 +77,6 @@ #include "nsIDOMHTMLDocument.h" #include "nsPIDOMEventTarget.h" #include "nsPIDOMWindow.h" -#include "nsIDOMEventReceiver.h" #include "nsIWebProgressListener.h" #include "nsIBrowserDOMWindow.h" #include "nsIPermissionManager.h" @@ -423,9 +422,8 @@ enum StatusPriority { nsCOMPtr contentWindow = [[self getBrowserView] getContentWindow]; nsCOMPtr piWindow(do_QueryInterface(contentWindow)); nsPIDOMEventTarget *chromeHandler = piWindow->GetChromeEventHandler(); - nsCOMPtr rec(do_QueryInterface(chromeHandler)); - if ( rec ) - rec->AddEventListenerByIID(clickListener, NS_GET_IID(nsIDOMMouseListener)); + if (chromeHandler) + chromeHandler->AddEventListenerByIID(clickListener, NS_GET_IID(nsIDOMMouseListener)); } } diff --git a/mozilla/camino/src/embedding/CHBrowserView.mm b/mozilla/camino/src/embedding/CHBrowserView.mm index 15511333984..df5375edfe5 100644 --- a/mozilla/camino/src/embedding/CHBrowserView.mm +++ b/mozilla/camino/src/embedding/CHBrowserView.mm @@ -56,7 +56,6 @@ #include "nsIDOMWindow.h" #include "nsPIDOMWindow.h" #include "nsPIDOMEventTarget.h" -#include "nsIDOMEventReceiver.h" #include "nsIWidget.h" #include "nsIPrefBranch.h" @@ -240,13 +239,12 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; nsCOMPtr contentWindow = [self getContentWindow]; nsCOMPtr piWindow(do_QueryInterface(contentWindow)); nsPIDOMEventTarget *chromeHandler = piWindow->GetChromeEventHandler(); - nsCOMPtr rec(do_QueryInterface(chromeHandler)); - if ( rec ) - rec->AddEventListenerByIID(clickListener, NS_GET_IID(nsIDOMMouseListener)); + if (chromeHandler) + chromeHandler->AddEventListenerByIID(clickListener, NS_GET_IID(nsIDOMMouseListener)); // register the CHBrowserListener as an event listener for popup-blocking events, // and link-added events. - nsCOMPtr eventTarget = do_QueryInterface(rec); + nsCOMPtr eventTarget = do_QueryInterface(chromeHandler); if (eventTarget) { rv = eventTarget->AddEventListener(NS_LITERAL_STRING("DOMPopupBlocked"), diff --git a/mozilla/content/base/src/nsContentAreaDragDrop.cpp b/mozilla/content/base/src/nsContentAreaDragDrop.cpp index 7fc1bce2991..467b95b7610 100644 --- a/mozilla/content/base/src/nsContentAreaDragDrop.cpp +++ b/mozilla/content/base/src/nsContentAreaDragDrop.cpp @@ -50,7 +50,6 @@ #include "nsISelection.h" #include "nsIDOMNode.h" #include "nsIDOMNodeList.h" -#include "nsIDOMEventReceiver.h" #include "nsIDOMEvent.h" #include "nsIDOMNSEvent.h" #include "nsIDOMMouseEvent.h" @@ -98,6 +97,7 @@ #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"); - mEventReceiver = do_QueryInterface(inAttachPoint); - NS_ASSERTION(mEventReceiver, - "Target doesn't implement nsIDOMEventReceiver as needed"); + mEventTarget = do_QueryInterface(inAttachPoint); + NS_ASSERTION(mEventTarget, + "Target doesn't implement nsPIDOMEventTarget as needed"); mNavigator = inNavigator; return AddDragListener(); @@ -216,10 +216,10 @@ nsContentAreaDragDrop::AddDragListener() { nsresult rv = NS_ERROR_FAILURE; - if ( mEventReceiver ) { + if (mEventTarget) { nsIDOMDragListener *pListener = NS_STATIC_CAST(nsIDOMDragListener *, this); - rv = mEventReceiver->AddEventListenerByIID(pListener, - NS_GET_IID(nsIDOMDragListener)); + rv = mEventTarget->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 (mEventReceiver) { + if (mEventTarget) { nsIDOMDragListener *pListener = NS_STATIC_CAST(nsIDOMDragListener *, this); rv = - mEventReceiver->RemoveEventListenerByIID(pListener, - NS_GET_IID(nsIDOMDragListener)); + mEventTarget->RemoveEventListenerByIID(pListener, + NS_GET_IID(nsIDOMDragListener)); if (NS_SUCCEEDED(rv)) mListenerInstalled = PR_FALSE; - mEventReceiver = nsnull; + mEventTarget = nsnull; } return rv; diff --git a/mozilla/content/base/src/nsContentAreaDragDrop.h b/mozilla/content/base/src/nsContentAreaDragDrop.h index 9522fed1219..16549bc6452 100644 --- a/mozilla/content/base/src/nsContentAreaDragDrop.h +++ b/mozilla/content/base/src/nsContentAreaDragDrop.h @@ -44,7 +44,7 @@ #include "nsIDragDropHandler.h" #include "nsIDOMDragListener.h" -#include "nsIDOMEventReceiver.h" +#include "nsPIDOMEventTarget.h" #include "nsITransferable.h" class nsIDOMNode; @@ -120,7 +120,7 @@ private: PRPackedBool mListenerInstalled; - nsCOMPtr mEventReceiver; + nsCOMPtr mEventTarget; // 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/mozilla/content/base/src/nsContentUtils.cpp b/mozilla/content/base/src/nsContentUtils.cpp index 6d1e02a8855..3bdb2c20cdf 100644 --- a/mozilla/content/base/src/nsContentUtils.cpp +++ b/mozilla/content/base/src/nsContentUtils.cpp @@ -107,7 +107,6 @@ #include "nsCRT.h" #include "nsIDOMEvent.h" #include "nsIDOMEventTarget.h" -#include "nsIDOMEventReceiver.h" #include "nsIPrivateDOMEvent.h" #include "nsIDOMDocumentEvent.h" #ifdef MOZ_XTF @@ -2980,10 +2979,10 @@ nsContentUtils::HasMutationListeners(nsINode* aNode, } // If we have a window, we can check it for mutation listeners now. - nsCOMPtr rec(do_QueryInterface(window)); - if (rec) { + nsCOMPtr piTarget(do_QueryInterface(window)); + if (piTarget) { nsCOMPtr manager; - rec->GetListenerManager(PR_FALSE, getter_AddRefs(manager)); + piTarget->GetListenerManager(PR_FALSE, getter_AddRefs(manager)); if (manager) { PRBool hasListeners = PR_FALSE; manager->HasMutationListeners(&hasListeners); diff --git a/mozilla/content/base/src/nsDOMAttribute.cpp b/mozilla/content/base/src/nsDOMAttribute.cpp index 36ec9498a91..32d4da317d3 100644 --- a/mozilla/content/base/src/nsDOMAttribute.cpp +++ b/mozilla/content/base/src/nsDOMAttribute.cpp @@ -56,6 +56,7 @@ #include "nsGkAtoms.h" #include "nsCOMArray.h" #include "nsNodeUtils.h" +#include "nsIEventListenerManager.h" //---------------------------------------------------------------------- PRBool nsDOMAttribute::sInitialized; @@ -720,13 +721,48 @@ nsDOMAttribute::DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent, return NS_ERROR_NOT_IMPLEMENTED; } -NS_IMETHODIMP +nsresult 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/mozilla/content/base/src/nsDOMAttribute.h b/mozilla/content/base/src/nsDOMAttribute.h index 841cc9c6680..619ca8a2dfd 100644 --- a/mozilla/content/base/src/nsDOMAttribute.h +++ b/mozilla/content/base/src/nsDOMAttribute.h @@ -100,8 +100,13 @@ public: virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult); + 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; static void Initialize(); diff --git a/mozilla/content/base/src/nsDOMParser.cpp b/mozilla/content/base/src/nsDOMParser.cpp index c4a11867a88..e225dc15eda 100644 --- a/mozilla/content/base/src/nsDOMParser.cpp +++ b/mozilla/content/base/src/nsDOMParser.cpp @@ -50,7 +50,6 @@ #include "nsIDOMClassInfo.h" #include "nsReadableUtils.h" #include "nsCRT.h" -#include "nsIDOMEventReceiver.h" #include "nsLoadListenerProxy.h" #include "nsStreamUtils.h" #include "nsThreadUtils.h" @@ -224,7 +223,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/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 508641a3401..96184a0899a 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -894,7 +894,6 @@ 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) @@ -4518,7 +4517,7 @@ nsDocument::GetOwnerDocument(nsIDOMDocument** aOwnerDocument) return NS_OK; } -NS_IMETHODIMP +nsresult nsDocument::GetListenerManager(PRBool aCreateIfNotFound, nsIEventListenerManager** aInstancePtrResult) { @@ -5403,10 +5402,10 @@ PRBool nsDocument::CanSavePresentation(nsIRequest *aNewRequest) { // Check our event listener manager for unload/beforeunload listeners. - nsCOMPtr er = do_QueryInterface(mScriptGlobalObject); - if (er) { + nsCOMPtr piTarget = do_QueryInterface(mScriptGlobalObject); + if (piTarget) { nsCOMPtr manager; - er->GetListenerManager(PR_FALSE, getter_AddRefs(manager)); + piTarget->GetListenerManager(PR_FALSE, getter_AddRefs(manager)); if (manager && manager->HasUnloadListeners()) { return PR_FALSE; } diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h index 72c62b2e490..5ef564c4e6c 100644 --- a/mozilla/content/base/src/nsDocument.h +++ b/mozilla/content/base/src/nsDocument.h @@ -59,7 +59,6 @@ #include "nsIDOMDocumentRange.h" #include "nsIDOMDocumentTraversal.h" #include "nsStubDocumentObserver.h" -#include "nsIDOMEventReceiver.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMNSEventTarget.h" #include "nsIDOMStyleSheetList.h" @@ -288,7 +287,7 @@ class nsDocument : public nsIDocument, public nsIDOMDocumentXBL, public nsIDOM3Document, public nsSupportsWeakReference, - public nsIDOMEventReceiver, + public nsIDOMEventTarget, public nsIDOM3EventTarget, public nsIDOMNSEventTarget, public nsIScriptObjectPrincipal, @@ -531,6 +530,13 @@ 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; @@ -602,15 +608,6 @@ 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/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp index e30186489d6..154a38a67c9 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp @@ -94,8 +94,6 @@ 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, @@ -713,13 +711,48 @@ nsGenericDOMDataNode::DispatchDOMEvent(nsEvent* aEvent, aPresContext, aEventStatus); } -NS_IMETHODIMP +nsresult 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/mozilla/content/base/src/nsGenericDOMDataNode.h b/mozilla/content/base/src/nsGenericDOMDataNode.h index a198e4a499f..94209db51c2 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.h +++ b/mozilla/content/base/src/nsGenericDOMDataNode.h @@ -44,7 +44,7 @@ #define nsGenericDOMDataNode_h___ #include "nsIDOMCharacterData.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsTextFragment.h" #include "nsVoidArray.h" #include "nsDOMError.h" @@ -180,8 +180,13 @@ public: virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult); + 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); // Implementation for nsIContent virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index e76d20449ca..aa1e406b174 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -51,7 +51,6 @@ #include "nsIDOMNodeList.h" #include "nsIDOMDocument.h" #include "nsIDOMText.h" -#include "nsIDOMEventReceiver.h" #include "nsIContentIterator.h" #include "nsIEventListenerManager.h" #include "nsIFocusController.h" @@ -215,13 +214,48 @@ nsINode::UnsetProperty(PRUint16 aCategory, nsIAtom *aPropertyName, aStatus); } -NS_IMETHODIMP +nsresult 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() { @@ -679,7 +713,6 @@ 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) @@ -745,17 +778,6 @@ 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) { @@ -767,48 +789,6 @@ 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) { @@ -835,25 +815,23 @@ nsDOMEventRTTearoff::AddEventListener(const nsAString& aType, } NS_IMETHODIMP -nsDOMEventRTTearoff::RemoveEventListener(const nsAString& type, - nsIDOMEventListener *listener, - PRBool useCapture) +nsDOMEventRTTearoff::RemoveEventListener(const nsAString& aType, + nsIDOMEventListener* aListener, + PRBool aUseCapture) { - nsCOMPtr event_receiver; - nsresult rv = GetEventReceiver(getter_AddRefs(event_receiver)); - NS_ENSURE_SUCCESS(rv, rv); - - return event_receiver->RemoveEventListener(type, listener, useCapture); + return RemoveGroupedEventListener(aType, aListener, aUseCapture, nsnull); } NS_IMETHODIMP -nsDOMEventRTTearoff::DispatchEvent(nsIDOMEvent *evt, PRBool* _retval) +nsDOMEventRTTearoff::DispatchEvent(nsIDOMEvent *aEvt, PRBool* _retval) { - nsCOMPtr event_receiver; - nsresult rv = GetEventReceiver(getter_AddRefs(event_receiver)); + nsCOMPtr listener_manager; + nsresult rv = + mContent->GetListenerManager(PR_TRUE, getter_AddRefs(listener_manager)); NS_ENSURE_SUCCESS(rv, rv); - - return event_receiver->DispatchEvent(evt, _retval); + nsCOMPtr target = do_QueryInterface(listener_manager); + NS_ENSURE_STATE(target); + return target->DispatchEvent(aEvt, _retval); } // nsIDOM3EventTarget @@ -3095,8 +3073,6 @@ 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/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h index e1715c059d8..baaf31ef883 100644 --- a/mozilla/content/base/src/nsGenericElement.h +++ b/mozilla/content/base/src/nsGenericElement.h @@ -49,7 +49,7 @@ #include "nsIContent.h" #include "nsIDOMElement.h" #include "nsIDOMDocumentFragment.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOM3EventTarget.h" #include "nsIDOM3Node.h" #include "nsIDOMNSEventTarget.h" @@ -225,7 +225,7 @@ private: * @see nsDOMEventRTTearoff::Create */ -class nsDOMEventRTTearoff : public nsIDOMEventReceiver, +class nsDOMEventRTTearoff : public nsIDOMEventTarget, public nsIDOM3EventTarget, public nsIDOMNSEventTarget { @@ -248,7 +248,6 @@ private: */ void LastRelease(); - nsresult GetEventReceiver(nsIDOMEventReceiver **aReceiver); nsresult GetDOM3EventTarget(nsIDOM3EventTarget **aTarget); public: @@ -274,15 +273,6 @@ 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 @@ -399,8 +389,13 @@ public: virtual nsresult DispatchDOMEvent(nsEvent* aEvent, nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult); + 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); // nsIContent interface methods virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, diff --git a/mozilla/content/base/src/nsSyncLoadService.cpp b/mozilla/content/base/src/nsSyncLoadService.cpp index 18d5f96d715..353851aa9b4 100644 --- a/mozilla/content/base/src/nsSyncLoadService.cpp +++ b/mozilla/content/base/src/nsSyncLoadService.cpp @@ -51,7 +51,6 @@ #include "nsIDocument.h" #include "nsIDOMDocument.h" #include "nsIDOMDOMImplementation.h" -#include "nsIDOMEventReceiver.h" #include "nsIPrivateDOMImplementation.h" #include "nsIScriptSecurityManager.h" #include "nsContentUtils.h" @@ -225,7 +224,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/mozilla/content/base/src/nsXMLHttpRequest.cpp b/mozilla/content/base/src/nsXMLHttpRequest.cpp index 15f8e9ea62d..da0aad0c369 100644 --- a/mozilla/content/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/content/base/src/nsXMLHttpRequest.cpp @@ -50,7 +50,6 @@ #include "nsIDOMSerializer.h" #include "nsXPCOM.h" #include "nsISupportsPrimitives.h" -#include "nsIDOMEventReceiver.h" #include "nsIEventListenerManager.h" #include "nsGUIEvent.h" #include "nsIPrivateDOMEvent.h" @@ -1302,7 +1301,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/mozilla/content/events/public/nsPIDOMEventTarget.h b/mozilla/content/events/public/nsPIDOMEventTarget.h index 1e07d11a935..3d8f18c1ebd 100644 --- a/mozilla/content/events/public/nsPIDOMEventTarget.h +++ b/mozilla/content/events/public/nsPIDOMEventTarget.h @@ -46,11 +46,13 @@ class nsPresContext; class nsEventChainPreVisitor; class nsEventChainPostVisitor; class nsIEventListenerManager; +class nsIDOMEventListener; +class nsIDOMEventGroup; // 360fa72e-c709-42cc-9285-1f755ec90376 #define NS_PIDOMEVENTTARGET_IID \ -{ 0x360fa72e, 0xc709, 0x42cc, \ - { 0x92, 0x85, 0x1f, 0x75, 0x5e, 0xc9, 0x03, 0x76 } } + { 0x44a6597b, 0x9fc3, 0x4a8d, \ + { 0xb7, 0xa4, 0xd9, 0x00, 0x9a, 0xbf, 0x9d, 0x15 } } class nsPIDOMEventTarget : public nsISupports { @@ -129,8 +131,24 @@ public: * one already exists. [IN] * @param aResult The event listener manager [OUT] */ - NS_IMETHOD GetListenerManager(PRBool aCreateIfNotFound, - nsIEventListenerManager** aResult) = 0; + 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_DEFINE_STATIC_IID_ACCESSOR(nsPIDOMEventTarget, NS_PIDOMEVENTTARGET_IID) diff --git a/mozilla/content/events/src/nsEventDispatcher.cpp b/mozilla/content/events/src/nsEventDispatcher.cpp index 91171597ba5..31a51000427 100644 --- a/mozilla/content/events/src/nsEventDispatcher.cpp +++ b/mozilla/content/events/src/nsEventDispatcher.cpp @@ -43,7 +43,6 @@ #include "nsPIDOMEventTarget.h" #include "nsPresContext.h" #include "nsIPrivateDOMEvent.h" -#include "nsIDOMEventReceiver.h" #include "nsIDOMEventTarget.h" #include "nsIEventListenerManager.h" #include "nsPIDOMWindow.h" diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp index c7ad28e6f98..5af2eda0227 100644 --- a/mozilla/content/events/src/nsEventListenerManager.cpp +++ b/mozilla/content/events/src/nsEventListenerManager.cpp @@ -393,7 +393,6 @@ 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) @@ -1373,35 +1372,6 @@ 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/mozilla/content/events/src/nsEventListenerManager.h b/mozilla/content/events/src/nsEventListenerManager.h index 6fdaaf7dea6..91f74ed7a80 100644 --- a/mozilla/content/events/src/nsEventListenerManager.h +++ b/mozilla/content/events/src/nsEventListenerManager.h @@ -42,7 +42,7 @@ #include "jsapi.h" #include "nsCOMPtr.h" #include "nsAutoPtr.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOM3EventTarget.h" #include "nsHashtable.h" #include "nsIScriptContext.h" @@ -68,7 +68,7 @@ typedef struct { */ class nsEventListenerManager : public nsIEventListenerManager, - public nsIDOMEventReceiver, + public nsIDOMEventTarget, public nsIDOM3EventTarget { @@ -139,15 +139,6 @@ 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/mozilla/content/events/src/nsXMLEventsManager.cpp b/mozilla/content/events/src/nsXMLEventsManager.cpp index 23b86302441..9be1dd59bf5 100644 --- a/mozilla/content/events/src/nsXMLEventsManager.cpp +++ b/mozilla/content/events/src/nsXMLEventsManager.cpp @@ -41,7 +41,7 @@ #include "nsGkAtoms.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsNetUtil.h" #include "nsIURL.h" #include "nsIDOMEventListener.h" diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp index 4d038751932..f3182f6fc9a 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp @@ -50,7 +50,6 @@ #include "nsIDOMHTMLBodyElement.h" #include "nsIDOMHTMLDocument.h" #include "nsIDOMAttr.h" -#include "nsIDOMEventReceiver.h" #include "nsIDOMDocumentFragment.h" #include "nsIDOMNSHTMLDocument.h" #include "nsIDOMNSHTMLElement.h" @@ -1377,10 +1376,10 @@ nsGenericHTMLElement::GetEventListenerManagerForAttr(nsIEventListenerManager** a nsIDocument *document = GetOwnerDoc(); nsresult rv = NS_OK; if (document && (win = document->GetInnerWindow())) { - nsCOMPtr receiver(do_QueryInterface(win)); - NS_ENSURE_TRUE(receiver, NS_ERROR_FAILURE); + nsCOMPtr piTarget(do_QueryInterface(win)); + NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE); - rv = receiver->GetListenerManager(PR_TRUE, aManager); + rv = piTarget->GetListenerManager(PR_TRUE, aManager); if (NS_SUCCEEDED(rv)) { NS_ADDREF(*aTarget = win); diff --git a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp index 11ec47e5ef5..9f238743d5b 100644 --- a/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLAnchorElement.cpp @@ -41,7 +41,7 @@ #include "nsUnicharUtils.h" #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMNSHTMLAnchorElement2.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIHTMLDocument.h" #include "nsGenericHTMLElement.h" #include "nsILink.h" diff --git a/mozilla/content/html/content/src/nsHTMLAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLAreaElement.cpp index 07d2f85f818..4f32b9d5be4 100644 --- a/mozilla/content/html/content/src/nsHTMLAreaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLAreaElement.cpp @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLAreaElement.h" #include "nsIDOMNSHTMLAreaElement2.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsILink.h" #include "nsIPresShell.h" diff --git a/mozilla/content/html/content/src/nsHTMLBRElement.cpp b/mozilla/content/html/content/src/nsHTMLBRElement.cpp index d45e078ed68..36eeadc6dec 100644 --- a/mozilla/content/html/content/src/nsHTMLBRElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLBRElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLBRElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp index ee99df8b029..6b6f8af4dab 100644 --- a/mozilla/content/html/content/src/nsHTMLBodyElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLBodyElement.cpp @@ -38,7 +38,7 @@ #include "nscore.h" #include "nsCOMPtr.h" #include "nsIDOMHTMLBodyElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp index 0e0f782782a..e928a1311ce 100644 --- a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLButtonElement.h" #include "nsIDOMNSHTMLButtonElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsIPresShell.h" diff --git a/mozilla/content/html/content/src/nsHTMLDelElement.cpp b/mozilla/content/html/content/src/nsHTMLDelElement.cpp index bc8ad02c7a9..b7d9105442f 100644 --- a/mozilla/content/html/content/src/nsHTMLDelElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLDelElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLModElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLDivElement.cpp b/mozilla/content/html/content/src/nsHTMLDivElement.cpp index d3e943a7549..4573262c1ab 100644 --- a/mozilla/content/html/content/src/nsHTMLDivElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLDivElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLDivElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp b/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp index 90ef721de9a..c23b88629e5 100644 --- a/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFieldSetElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLFieldSetElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsStyleConsts.h" #include "nsPresContext.h" diff --git a/mozilla/content/html/content/src/nsHTMLFontElement.cpp b/mozilla/content/html/content/src/nsHTMLFontElement.cpp index 62861d33419..75b61f66411 100644 --- a/mozilla/content/html/content/src/nsHTMLFontElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFontElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "nsIDOMHTMLFontElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsIDeviceContext.h" diff --git a/mozilla/content/html/content/src/nsHTMLFormElement.cpp b/mozilla/content/html/content/src/nsHTMLFormElement.cpp index fadfb897853..84230618c70 100644 --- a/mozilla/content/html/content/src/nsHTMLFormElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFormElement.cpp @@ -42,7 +42,7 @@ #include "nsIDOMNSHTMLFormElement.h" #include "nsIHTMLDocument.h" #include "nsIDOMNSHTMLFormControlList.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsEventStateManager.h" #include "nsGkAtoms.h" diff --git a/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp b/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp index 5bad7da6470..fccc4f74ec9 100644 --- a/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFrameSetElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLFrameSetElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLHRElement.cpp b/mozilla/content/html/content/src/nsHTMLHRElement.cpp index 8d744bb95f0..15d64a536c0 100644 --- a/mozilla/content/html/content/src/nsHTMLHRElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLHRElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLHRElement.h" #include "nsIDOMNSHTMLHRElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLHeadElement.cpp b/mozilla/content/html/content/src/nsHTMLHeadElement.cpp index 94c2d746ad6..50d45f51de8 100644 --- a/mozilla/content/html/content/src/nsHTMLHeadElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLHeadElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLHeadElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLHeadingElement.cpp b/mozilla/content/html/content/src/nsHTMLHeadingElement.cpp index 4ca64c18934..de544499d75 100644 --- a/mozilla/content/html/content/src/nsHTMLHeadingElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLHeadingElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLHeadingElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLHtmlElement.cpp b/mozilla/content/html/content/src/nsHTMLHtmlElement.cpp index 89d9f81e58a..fb43004d268 100644 --- a/mozilla/content/html/content/src/nsHTMLHtmlElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLHtmlElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLHtmlElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index afe937f15a7..b6d75ba9151 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLImageElement.h" #include "nsIDOMNSHTMLImageElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsImageLoadingContent.h" #include "nsGkAtoms.h" diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index 9f425bebac0..517714bbd51 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -51,7 +51,7 @@ #include "nsContentCID.h" #include "nsIComponentManager.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" @@ -88,7 +88,7 @@ #include "nsLayoutUtils.h" #include "nsIDOMMutationEvent.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsMutationEvent.h" #include "nsIEventListenerManager.h" diff --git a/mozilla/content/html/content/src/nsHTMLLIElement.cpp b/mozilla/content/html/content/src/nsHTMLLIElement.cpp index 8a7b8c30a70..72463937f14 100644 --- a/mozilla/content/html/content/src/nsHTMLLIElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLLIElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLLIElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp index e7568108b8d..168bfaa8579 100644 --- a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp @@ -37,7 +37,7 @@ #include "nsCOMPtr.h" #include "nsIDOMHTMLLabelElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLLegendElement.cpp b/mozilla/content/html/content/src/nsHTMLLegendElement.cpp index 05de5d27ce1..1d84337b91e 100644 --- a/mozilla/content/html/content/src/nsHTMLLegendElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLLegendElement.cpp @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLLegendElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLLinkElement.cpp b/mozilla/content/html/content/src/nsHTMLLinkElement.cpp index 21a35e15013..045f8b77250 100644 --- a/mozilla/content/html/content/src/nsHTMLLinkElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLLinkElement.cpp @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLLinkElement.h" #include "nsIDOMLinkStyle.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsILink.h" #include "nsGkAtoms.h" diff --git a/mozilla/content/html/content/src/nsHTMLMapElement.cpp b/mozilla/content/html/content/src/nsHTMLMapElement.cpp index 4f434b31dd5..8b39631b7c1 100644 --- a/mozilla/content/html/content/src/nsHTMLMapElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLMapElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLMapElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLMetaElement.cpp b/mozilla/content/html/content/src/nsHTMLMetaElement.cpp index 1217c1d2f3f..5732268e4b9 100644 --- a/mozilla/content/html/content/src/nsHTMLMetaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLMetaElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLMetaElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLOListElement.cpp b/mozilla/content/html/content/src/nsHTMLOListElement.cpp index 6db9067090b..9418beb4128 100644 --- a/mozilla/content/html/content/src/nsHTMLOListElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOListElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLOListElement.h" #include "nsIDOMHTMLDListElement.h" #include "nsIDOMHTMLUListElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp b/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp index 0ba16b57d09..2587b30700b 100644 --- a/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOptGroupElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLOptGroupElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp index 936fd738f0e..c623dc3db09 100644 --- a/mozilla/content/html/content/src/nsHTMLOptionElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLOptionElement.cpp @@ -41,7 +41,7 @@ #include "nsIOptionElement.h" #include "nsIDOMHTMLOptGroupElement.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp b/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp index 17ffa7c16bd..17f2eda41e2 100644 --- a/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLParagraphElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLParagraphElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLPreElement.cpp b/mozilla/content/html/content/src/nsHTMLPreElement.cpp index cda03ed5e76..9935b895477 100644 --- a/mozilla/content/html/content/src/nsHTMLPreElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLPreElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLPreElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp index 27a81f902f8..6d461fe1f32 100644 --- a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp @@ -36,7 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLScriptElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp index a9e6738f365..a131dee6c99 100644 --- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp @@ -42,7 +42,7 @@ #include "nsIDOMNSHTMLSelectElement.h" #include "nsIDOMNSXBLFormControl.h" #include "nsIDOMHTMLFormElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsContentCreatorFunctions.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/mozilla/content/html/content/src/nsHTMLSpanElement.cpp b/mozilla/content/html/content/src/nsHTMLSpanElement.cpp index 97d9af700e6..2fd3f1a1240 100644 --- a/mozilla/content/html/content/src/nsHTMLSpanElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSpanElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLStyleElement.cpp b/mozilla/content/html/content/src/nsHTMLStyleElement.cpp index 32a03e1c34d..08eb35f40d5 100644 --- a/mozilla/content/html/content/src/nsHTMLStyleElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLStyleElement.cpp @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLStyleElement.h" #include "nsIDOMLinkStyle.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp b/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp index 5e77c13070d..186cd8b924a 100644 --- a/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableCaptionElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLTableCaptionElem.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp index 721410cacfb..8212e0c32cc 100644 --- a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp @@ -37,7 +37,7 @@ #include "nsIDOMHTMLTableCellElement.h" #include "nsIDOMHTMLTableRowElement.h" #include "nsIDOMHTMLCollection.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsMappedAttributes.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/mozilla/content/html/content/src/nsHTMLTableColElement.cpp b/mozilla/content/html/content/src/nsHTMLTableColElement.cpp index ec3d5942248..dcd055b3c0b 100644 --- a/mozilla/content/html/content/src/nsHTMLTableColElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableColElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLTableColElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsMappedAttributes.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/mozilla/content/html/content/src/nsHTMLTableElement.cpp b/mozilla/content/html/content/src/nsHTMLTableElement.cpp index 33c812b804d..385f48cc4e8 100644 --- a/mozilla/content/html/content/src/nsHTMLTableElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableElement.cpp @@ -38,7 +38,7 @@ #include "nsIDOMHTMLTableCaptionElem.h" #include "nsIDOMHTMLTableSectionElem.h" #include "nsCOMPtr.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsDOMError.h" #include "nsContentList.h" #include "nsMappedAttributes.h" diff --git a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp index c7ce9244ba5..d8bd9f273fb 100644 --- a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp @@ -38,7 +38,7 @@ #include "nsIDOMHTMLTableElement.h" #include "nsIDOMHTMLTableSectionElem.h" #include "nsIDOMHTMLTableCellElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsDOMError.h" #include "nsMappedAttributes.h" #include "nsGenericHTMLElement.h" diff --git a/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp b/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp index edbf8c29721..8a29e282b10 100644 --- a/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLTableSectionElem.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsMappedAttributes.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" diff --git a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp index f3f294c029e..cebf913870a 100644 --- a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp @@ -50,7 +50,7 @@ #include "nsIFormControl.h" #include "nsIForm.h" #include "nsIFormSubmission.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsGkAtoms.h" #include "nsStyleConsts.h" diff --git a/mozilla/content/html/content/src/nsHTMLTitleElement.cpp b/mozilla/content/html/content/src/nsHTMLTitleElement.cpp index 0b043c6e0ea..5aba1cf987e 100644 --- a/mozilla/content/html/content/src/nsHTMLTitleElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTitleElement.cpp @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ #include "nsIDOMHTMLTitleElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsGenericHTMLElement.h" #include "nsStyleConsts.h" #include "nsPresContext.h" diff --git a/mozilla/content/svg/content/src/nsSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGElement.cpp index d72361ef451..d8bf9748bf5 100644 --- a/mozilla/content/svg/content/src/nsSVGElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGElement.cpp @@ -41,7 +41,7 @@ #include "nsIDocument.h" #include "nsRange.h" #include "nsIDOMAttr.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMMutationEvent.h" #include "nsMutationEvent.h" #include "nsBindingManager.h" diff --git a/mozilla/content/xbl/public/nsIXBLService.h b/mozilla/content/xbl/public/nsIXBLService.h index 22b9ca156d7..c43ba357035 100644 --- a/mozilla/content/xbl/public/nsIXBLService.h +++ b/mozilla/content/xbl/public/nsIXBLService.h @@ -49,7 +49,7 @@ class nsIContent; class nsIDocument; -class nsIDOMEventReceiver; +class nsPIDOMEventTarget; class nsIDOMNodeList; class nsXBLBinding; class nsIXBLDocumentInfo; @@ -57,8 +57,8 @@ class nsIURI; class nsIAtom; #define NS_IXBLSERVICE_IID \ - { 0x7157b300, 0xf49b, 0x4e7d, \ - { 0xac, 0x3a, 0xef, 0x8f, 0x20, 0x69, 0x6e, 0xb1 } } + { 0xefda61b3, 0x5d04, 0x43b0, \ + { 0x98, 0x0c, 0x32, 0x62, 0x72, 0xc8, 0x5c, 0x68 } } 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(nsIDOMEventReceiver* aElement)=0; + NS_IMETHOD AttachGlobalKeyHandler(nsPIDOMEventTarget* aTarget)=0; }; diff --git a/mozilla/content/xbl/src/nsXBLBinding.cpp b/mozilla/content/xbl/src/nsXBLBinding.cpp index e975e9836e0..6f8bb707c76 100644 --- a/mozilla/content/xbl/src/nsXBLBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLBinding.cpp @@ -45,7 +45,7 @@ #include "nsHashtable.h" #include "nsIURI.h" #include "nsIURL.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIChannel.h" #include "nsXPIDLString.h" #include "nsReadableUtils.h" @@ -815,8 +815,8 @@ nsXBLBinding::UnhookEventHandlers() nsXBLPrototypeHandler* handlerChain = mPrototypeBinding->GetPrototypeHandlers(); if (handlerChain) { - nsCOMPtr receiver = do_QueryInterface(mBoundElement); - nsCOMPtr target = do_QueryInterface(receiver); + nsCOMPtr piTarget = do_QueryInterface(mBoundElement); + nsCOMPtr target = do_QueryInterface(piTarget); 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) - receiver->GetSystemEventGroup(getter_AddRefs(systemEventGroup)); + piTarget->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) - receiver->GetSystemEventGroup(getter_AddRefs(systemEventGroup)); + piTarget->GetSystemEventGroup(getter_AddRefs(systemEventGroup)); eventGroup = systemEventGroup; } diff --git a/mozilla/content/xbl/src/nsXBLEventHandler.cpp b/mozilla/content/xbl/src/nsXBLEventHandler.cpp index a652d213a46..a01f88eb5ef 100644 --- a/mozilla/content/xbl/src/nsXBLEventHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLEventHandler.cpp @@ -40,7 +40,8 @@ #include "nsIAtom.h" #include "nsIContent.h" #include "nsIDOMEventGroup.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventListener.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMText.h" @@ -80,9 +81,9 @@ nsXBLEventHandler::HandleEvent(nsIDOMEvent* aEvent) nsCOMPtr target; aEvent->GetCurrentTarget(getter_AddRefs(target)); - nsCOMPtr receiver = do_QueryInterface(target); + nsCOMPtr piTarget = do_QueryInterface(target); - mProtoHandler->ExecuteHandler(receiver, aEvent); + mProtoHandler->ExecuteHandler(piTarget, aEvent); return NS_OK; } @@ -134,7 +135,7 @@ nsXBLKeyEventHandler::HandleEvent(nsIDOMEvent* aEvent) nsCOMPtr target; aEvent->GetCurrentTarget(getter_AddRefs(target)); - nsCOMPtr receiver = do_QueryInterface(target); + nsCOMPtr piTarget = do_QueryInterface(target); nsCOMPtr key(do_QueryInterface(aEvent)); @@ -153,7 +154,7 @@ nsXBLKeyEventHandler::HandleEvent(nsIDOMEvent* aEvent) (hasAllowUntrustedAttr && handler->AllowUntrustedEvents()) || (!hasAllowUntrustedAttr && !mIsBoundToChrome)) && handler->KeyEventMatched(key)) { - handler->ExecuteHandler(receiver, aEvent); + handler->ExecuteHandler(piTarget, aEvent); } } diff --git a/mozilla/content/xbl/src/nsXBLEventHandler.h b/mozilla/content/xbl/src/nsXBLEventHandler.h index ecd56f59b48..1af7c093d5a 100644 --- a/mozilla/content/xbl/src/nsXBLEventHandler.h +++ b/mozilla/content/xbl/src/nsXBLEventHandler.h @@ -46,7 +46,7 @@ class nsIAtom; class nsIContent; class nsIDOM3EventTarget; -class nsIDOMEventReceiver; +class nsPIDOMEventTarget; class nsXBLPrototypeHandler; class nsXBLEventHandler : public nsIDOMEventListener diff --git a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp index b5e2dc46e6f..3d0f69b2b97 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -43,7 +43,7 @@ #include "nsINameSpaceManager.h" #include "nsIURI.h" #include "nsIURL.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIChannel.h" #include "nsXPIDLString.h" #include "nsReadableUtils.h" diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp index aaa907fcca9..7fe05d6fa78 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -60,7 +60,7 @@ #include "nsIDOMText.h" #include "nsIFocusController.h" #include "nsIEventListenerManager.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMEventListener.h" #include "nsIPrivateDOMEvent.h" #include "nsIDOMNSEvent.h" @@ -212,7 +212,7 @@ nsXBLPrototypeHandler::InitAccessKeys() } nsresult -nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, +nsXBLPrototypeHandler::ExecuteHandler(nsPIDOMEventTarget* aTarget, nsIDOMEvent* aEvent) { nsresult rv = NS_ERROR_FAILURE; @@ -273,14 +273,14 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsCOMPtr controller; nsCOMPtr focusController; - nsCOMPtr windowRoot(do_QueryInterface(aReceiver)); + nsCOMPtr windowRoot(do_QueryInterface(aTarget)); if (windowRoot) { windowRoot->GetFocusController(getter_AddRefs(focusController)); } else { - nsCOMPtr privateWindow(do_QueryInterface(aReceiver)); + nsCOMPtr privateWindow(do_QueryInterface(aTarget)); if (!privateWindow) { - nsCOMPtr elt(do_QueryInterface(aReceiver)); + nsCOMPtr elt(do_QueryInterface(aTarget)); 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(nsIDOMEventReceiver* aReceiver, doc = elt->GetOwnerDoc(); if (!doc) - doc = do_QueryInterface(aReceiver); + doc = do_QueryInterface(aTarget); if (!doc) return NS_ERROR_FAILURE; @@ -307,7 +307,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, if (focusController) focusController->GetControllerForCommand(command.get(), getter_AddRefs(controller)); else - controller = GetController(aReceiver); // We're attached to the receiver possibly. + controller = GetController(aTarget); // We're attached to the receiver possibly. nsAutoString type; mEventName->ToString(type); @@ -418,7 +418,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, // Compile the handler and bind it to the element. nsCOMPtr boundGlobal; - nsCOMPtr winRoot(do_QueryInterface(aReceiver)); + nsCOMPtr winRoot(do_QueryInterface(aTarget)); nsCOMPtr focusedWin; if (winRoot) { @@ -441,13 +441,13 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, boundGlobal = do_QueryInterface(piWin->GetPrivateRoot()); } - else boundGlobal = do_QueryInterface(aReceiver); + else boundGlobal = do_QueryInterface(aTarget); if (!boundGlobal) { - nsCOMPtr boundDocument(do_QueryInterface(aReceiver)); + nsCOMPtr boundDocument(do_QueryInterface(aTarget)); if (!boundDocument) { // We must be an element. - nsCOMPtr content(do_QueryInterface(aReceiver)); + nsCOMPtr content(do_QueryInterface(aTarget)); if (!content) return NS_OK; boundDocument = content->GetOwnerDoc(); @@ -472,7 +472,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, if (winRoot) { scriptTarget = boundGlobal; } else { - scriptTarget = aReceiver; + scriptTarget = aTarget; } // 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(nsIDOMEventReceiver* aReceiver) +nsXBLPrototypeHandler::GetController(nsPIDOMEventTarget* aTarget) { // 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(aReceiver)); + nsCOMPtr xulElement(do_QueryInterface(aTarget)); if (xulElement) xulElement->GetControllers(getter_AddRefs(controllers)); if (!controllers) { - nsCOMPtr htmlTextArea(do_QueryInterface(aReceiver)); + nsCOMPtr htmlTextArea(do_QueryInterface(aTarget)); if (htmlTextArea) htmlTextArea->GetControllers(getter_AddRefs(controllers)); } if (!controllers) { - nsCOMPtr htmlInputElement(do_QueryInterface(aReceiver)); + nsCOMPtr htmlInputElement(do_QueryInterface(aTarget)); if (htmlInputElement) htmlInputElement->GetControllers(getter_AddRefs(controllers)); } if (!controllers) { - nsCOMPtr domWindow(do_QueryInterface(aReceiver)); + nsCOMPtr domWindow(do_QueryInterface(aTarget)); if (domWindow) domWindow->GetControllers(getter_AddRefs(controllers)); } diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.h b/mozilla/content/xbl/src/nsXBLPrototypeHandler.h index 9d98c992d70..a46c15fb947 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.h +++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.h @@ -52,7 +52,7 @@ class nsIContent; class nsIDOMUIEvent; class nsIDOMKeyEvent; class nsIDOMMouseEvent; -class nsIDOMEventReceiver; +class nsPIDOMEventTarget; class nsIDOM3EventTarget; class nsXBLPrototypeBinding; @@ -121,7 +121,7 @@ public: nsXBLPrototypeHandler* GetNextHandler() { return mNextHandler; } void SetNextHandler(nsXBLPrototypeHandler* aHandler) { mNextHandler = aHandler; } - nsresult ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsIDOMEvent* aEvent); + nsresult ExecuteHandler(nsPIDOMEventTarget* aTarget, nsIDOMEvent* aEvent); already_AddRefed GetEventName(); void SetEventName(nsIAtom* aName) { mEventName = aName; } @@ -157,7 +157,7 @@ public: static PRUint32 gRefCnt; protected: - already_AddRefed GetController(nsIDOMEventReceiver* aReceiver); + already_AddRefed GetController(nsPIDOMEventTarget* aTarget); inline PRInt32 GetMatchingKeyCode(const nsAString& aKeyName); void ConstructPrototype(nsIContent* aKeyElement, diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp index 30b4806fa06..38baa9b06c0 100644 --- a/mozilla/content/xbl/src/nsXBLService.cpp +++ b/mozilla/content/xbl/src/nsXBLService.cpp @@ -429,8 +429,8 @@ nsXBLStreamListener::Load(nsIDOMEvent* aEvent) nsXBLBindingRequest::Destroy(mXBLService->mPool, req); } - nsCOMPtr rec(do_QueryInterface(mBindingDocument)); - rec->RemoveEventListener(NS_LITERAL_STRING("load"), (nsIDOMLoadListener*)this, PR_FALSE); + nsCOMPtr target(do_QueryInterface(mBindingDocument)); + target->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(nsIDOMEventReceiver* aReceiver) +nsXBLService::AttachGlobalKeyHandler(nsPIDOMEventTarget* aTarget) { // check if the receiver is a content node (not a document), and hook // it to the document if that is the case. - nsCOMPtr rec = aReceiver; - nsCOMPtr contentNode(do_QueryInterface(aReceiver)); + nsCOMPtr piTarget = aTarget; + nsCOMPtr contentNode(do_QueryInterface(aTarget)); if (contentNode) { // Only attach if we're really in a document nsCOMPtr doc = contentNode->GetCurrentDoc(); if (doc) - rec = do_QueryInterface(doc); // We're a XUL keyset. Attach to our document. + piTarget = do_QueryInterface(doc); // We're a XUL keyset. Attach to our document. } - if (!rec) + if (!piTarget) return NS_ERROR_FAILURE; nsCOMPtr elt(do_QueryInterface(contentNode)); // Create the key handler nsXBLWindowKeyHandler* handler; - NS_NewXBLWindowKeyHandler(elt, rec, &handler); // This addRef's + NS_NewXBLWindowKeyHandler(elt, piTarget, &handler); // This addRef's if (!handler) return NS_ERROR_FAILURE; // listen to these events nsCOMPtr systemGroup; - rec->GetSystemEventGroup(getter_AddRefs(systemGroup)); - nsCOMPtr target = do_QueryInterface(rec); + piTarget->GetSystemEventGroup(getter_AddRefs(systemGroup)); + nsCOMPtr target = do_QueryInterface(piTarget); target->AddGroupedEventListener(NS_LITERAL_STRING("keydown"), handler, PR_FALSE, systemGroup); @@ -1146,8 +1146,10 @@ nsXBLService::FetchBindingDocument(nsIContent* aBoundElement, nsIDocument* aBoun nsXBLStreamListener* xblListener = new nsXBLStreamListener(this, listener, aBoundDocument, doc); NS_ENSURE_TRUE(xblListener,NS_ERROR_OUT_OF_MEMORY); - nsCOMPtr rec(do_QueryInterface(doc)); - rec->AddEventListener(NS_LITERAL_STRING("load"), (nsIDOMLoadListener*)xblListener, PR_FALSE); + nsCOMPtr target(do_QueryInterface(doc)); + target->AddEventListener(NS_LITERAL_STRING("load"), + NS_STATIC_CAST(nsIDOMLoadListener*, xblListener), + PR_FALSE); // Add ourselves to the list of loading docs. nsBindingManager *bindingManager; diff --git a/mozilla/content/xbl/src/nsXBLService.h b/mozilla/content/xbl/src/nsXBLService.h index 9f11ca566c5..35665fb7de2 100644 --- a/mozilla/content/xbl/src/nsXBLService.h +++ b/mozilla/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(nsIDOMEventReceiver* aElement); + NS_IMETHOD AttachGlobalKeyHandler(nsPIDOMEventTarget* aTarget); NS_DECL_NSIOBSERVER diff --git a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp index acf9b96f105..fe75a1731d0 100644 --- a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.cpp @@ -44,7 +44,7 @@ #include "nsIAtom.h" #include "nsIDOMNSUIEvent.h" #include "nsIDOMKeyEvent.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMNSEvent.h" #include "nsXBLService.h" #include "nsIServiceManager.h" @@ -175,8 +175,9 @@ nsXBLSpecialDocInfo::GetAllHandlers(const char* aType, nsXBLSpecialDocInfo* nsXBLWindowKeyHandler::sXBLSpecialDocInfo = nsnull; PRUint32 nsXBLWindowKeyHandler::sRefCnt = 0; -nsXBLWindowKeyHandler::nsXBLWindowKeyHandler(nsIDOMElement* aElement, nsIDOMEventReceiver* aReceiver) - : mReceiver(aReceiver), +nsXBLWindowKeyHandler::nsXBLWindowKeyHandler(nsIDOMElement* aElement, + nsPIDOMEventTarget* aTarget) + : mTarget(aTarget), mHandler(nsnull), mUserHandler(nsnull) { @@ -355,7 +356,7 @@ nsXBLWindowKeyHandler::WalkHandlers(nsIDOMEvent* aKeyEvent, nsIAtom* aEventType) // get the DOM window we're attached to nsCOMPtr controllers; - nsCOMPtr root = do_QueryInterface(mReceiver); + nsCOMPtr root = do_QueryInterface(mTarget); if (root) { nsCOMPtr fc; root->GetFocusController(getter_AddRefs(fc)); @@ -431,7 +432,7 @@ nsXBLWindowKeyHandler::ShutDown() PRBool nsXBLWindowKeyHandler::IsEditor() { - nsCOMPtr windowRoot(do_QueryInterface(mReceiver)); + nsCOMPtr windowRoot(do_QueryInterface(mTarget)); NS_ENSURE_TRUE(windowRoot, PR_FALSE); nsCOMPtr focusController; windowRoot->GetFocusController(getter_AddRefs(focusController)); @@ -534,15 +535,15 @@ nsXBLWindowKeyHandler::WalkHandlersInternal(nsIDOMEvent* aEvent, } } - nsCOMPtr rec; + nsCOMPtr piTarget; nsCOMPtr element = GetElement(); if (element) { - rec = do_QueryInterface(commandElt); + piTarget = do_QueryInterface(commandElt); } else { - rec = mReceiver; + piTarget = mTarget; } - rv = currHandler->ExecuteHandler(rec, aEvent); + rv = currHandler->ExecuteHandler(piTarget, aEvent); if (NS_SUCCEEDED(rv)) { return NS_OK; } @@ -563,9 +564,10 @@ nsXBLWindowKeyHandler::GetElement() /////////////////////////////////////////////////////////////////////////////////// nsresult -NS_NewXBLWindowKeyHandler(nsIDOMElement* aElement, nsIDOMEventReceiver* aReceiver, nsXBLWindowKeyHandler** aResult) +NS_NewXBLWindowKeyHandler(nsIDOMElement* aElement, nsPIDOMEventTarget* aTarget, + nsXBLWindowKeyHandler** aResult) { - *aResult = new nsXBLWindowKeyHandler(aElement, aReceiver); + *aResult = new nsXBLWindowKeyHandler(aElement, aTarget); if (!*aResult) return NS_ERROR_OUT_OF_MEMORY; NS_ADDREF(*aResult); diff --git a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h index 913b5b4c3a7..2cf27153e63 100644 --- a/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h +++ b/mozilla/content/xbl/src/nsXBLWindowKeyHandler.h @@ -45,7 +45,8 @@ class nsIAtom; class nsIDOMElement; -class nsIDOMEventReceiver; +class nsIDOMEventTarget; +class nsPIDOMEventTarget; class nsIXBLDocumentInfo; class nsXBLSpecialDocInfo; class nsXBLPrototypeHandler; @@ -53,7 +54,7 @@ class nsXBLPrototypeHandler; class nsXBLWindowKeyHandler : public nsIDOMKeyListener { public: - nsXBLWindowKeyHandler(nsIDOMElement* aElement, nsIDOMEventReceiver* aReceiver); + nsXBLWindowKeyHandler(nsIDOMElement* aElement, nsPIDOMEventTarget* aTarget); virtual ~nsXBLWindowKeyHandler(); // nsIDOMetc. @@ -95,7 +96,7 @@ protected: already_AddRefed GetElement(); // Using weak pointer to the DOM Element. nsWeakPtr mWeakPtrForElement; - nsIDOMEventReceiver* mReceiver; // weak ref + nsPIDOMEventTarget* mTarget; // weak ref // these are not owning references; the prototype handlers are owned // by the prototype bindings which are owned by the docinfo. @@ -109,7 +110,7 @@ protected: nsresult NS_NewXBLWindowKeyHandler(nsIDOMElement* aElement, - nsIDOMEventReceiver* aReceiver, + nsPIDOMEventTarget* aTarget, nsXBLWindowKeyHandler** aResult); #endif diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp index 38a4700d900..170b48c9493 100644 --- a/mozilla/content/xul/content/src/nsXULElement.cpp +++ b/mozilla/content/xul/content/src/nsXULElement.cpp @@ -77,7 +77,7 @@ #include "nsIDOMContextMenuListener.h" #include "nsIDOMDragListener.h" #include "nsIDOMEventListener.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.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 receiver = do_QueryInterface(window); - if (!receiver) + nsCOMPtr piTarget = do_QueryInterface(window); + if (!piTarget) return NS_ERROR_UNEXPECTED; - nsresult rv = receiver->GetListenerManager(PR_TRUE, aManager); + nsresult rv = piTarget->GetListenerManager(PR_TRUE, aManager); if (NS_SUCCEEDED(rv)) { NS_ADDREF(*aTarget = window); } diff --git a/mozilla/content/xul/content/src/nsXULElement.h b/mozilla/content/xul/content/src/nsXULElement.h index 20bc43e90fe..5cf20babd3a 100644 --- a/mozilla/content/xul/content/src/nsXULElement.h +++ b/mozilla/content/xul/content/src/nsXULElement.h @@ -57,7 +57,7 @@ #include "nsIControllers.h" #include "nsICSSParser.h" #include "nsIDOMElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMXULElement.h" #include "nsIDOMXULMultSelectCntrlEl.h" diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index ed725e7c782..f9fb6460c75 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/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 rec(do_QueryInterface(aElement)); - xblService->AttachGlobalKeyHandler(rec); + nsCOMPtr piTarget(do_QueryInterface(aElement)); + xblService->AttachGlobalKeyHandler(piTarget); } } diff --git a/mozilla/content/xul/document/src/nsXULDocument.h b/mozilla/content/xul/document/src/nsXULDocument.h index 84ae26bd530..86ba5812880 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.h +++ b/mozilla/content/xul/document/src/nsXULDocument.h @@ -49,7 +49,7 @@ #include "nsElementMap.h" #include "nsForwardReference.h" #include "nsIContent.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMXULCommandDispatcher.h" #include "nsIDOMXULDocument.h" #include "nsISupportsArray.h" diff --git a/mozilla/dom/public/coreEvents/Makefile.in b/mozilla/dom/public/coreEvents/Makefile.in index ab61537bc28..f34d74f499d 100644 --- a/mozilla/dom/public/coreEvents/Makefile.in +++ b/mozilla/dom/public/coreEvents/Makefile.in @@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk MODULE = dom EXPORTS = \ - nsIDOMEventReceiver.h \ nsIDOMFocusListener.h \ nsIDOMFormListener.h \ nsIDOMKeyListener.h \ diff --git a/mozilla/dom/public/coreEvents/nsIDOMEventReceiver.h b/mozilla/dom/public/coreEvents/nsIDOMEventReceiver.h deleted file mode 100644 index 722600aa969..00000000000 --- a/mozilla/dom/public/coreEvents/nsIDOMEventReceiver.h +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- 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/mozilla/dom/src/base/nsDOMClassInfo.cpp b/mozilla/dom/src/base/nsDOMClassInfo.cpp index e73b1f8cd30..53e61d64962 100644 --- a/mozilla/dom/src/base/nsDOMClassInfo.cpp +++ b/mozilla/dom/src/base/nsDOMClassInfo.cpp @@ -168,7 +168,7 @@ // Event related includes #include "nsIEventListenerManager.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMNSEventTarget.h" // CSS related includes @@ -6706,18 +6706,15 @@ nsEventReceiverSH::RegisterCompileHandler(nsIXPConnectWrappedNative *wrapper, nsIScriptContext *script_cx = nsJSUtils::GetStaticScriptContext(cx, obj); NS_ENSURE_TRUE(script_cx, NS_ERROR_UNEXPECTED); - nsCOMPtr receiver(do_QueryWrappedNative(wrapper)); - if (!receiver) { + nsCOMPtr piTarget(do_QueryWrappedNative(wrapper)); + if (!piTarget) { // Doesn't do events -#ifdef DEBUG - nsCOMPtr attr = do_QueryWrappedNative(wrapper); - NS_WARN_IF_FALSE(attr, "Non-attr doesn't QI to nsIDOMEventReceiver?"); -#endif + NS_WARNING("Doesn't QI to nsPIDOMEventTarget?"); return NS_OK; } nsCOMPtr manager; - receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); + piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); NS_ENSURE_TRUE(manager, NS_ERROR_UNEXPECTED); nsCOMPtr atom(do_GetAtom(nsDependentJSString(id))); @@ -6728,12 +6725,12 @@ nsEventReceiverSH::RegisterCompileHandler(nsIXPConnectWrappedNative *wrapper, JSObject *scope = GetGlobalJSObject(cx, obj); if (compile) { - rv = manager->CompileScriptEventListener(script_cx, scope, receiver, atom, + rv = manager->CompileScriptEventListener(script_cx, scope, piTarget, atom, did_define); } else if (remove) { rv = manager->RemoveScriptEventListener(atom); } else { - rv = manager->RegisterScriptEventListener(script_cx, scope, receiver, + rv = manager->RegisterScriptEventListener(script_cx, scope, piTarget, atom); } diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 883675352b1..6903677bbf2 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -698,7 +698,6 @@ 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) @@ -1293,9 +1292,9 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument, if (internal == NS_STATIC_CAST(nsIDOMWindowInternal *, this)) { nsCOMPtr xblService = do_GetService("@mozilla.org/xbl;1"); if (xblService) { - nsCOMPtr rec = + nsCOMPtr piTarget = do_QueryInterface(mChromeEventHandler); - xblService->AttachGlobalKeyHandler(rec); + xblService->AttachGlobalKeyHandler(piTarget); } } } @@ -5567,12 +5566,7 @@ nsGlobalWindow::AddEventListener(const nsAString& aType, return manager->AddEventListenerByType(aListener, aType, flags, nsnull); } - -//***************************************************************************** -// nsGlobalWindow::nsIDOMEventReceiver -//***************************************************************************** - -NS_IMETHODIMP +nsresult nsGlobalWindow::AddEventListenerByIID(nsIDOMEventListener* aListener, const nsIID& aIID) { @@ -5585,7 +5579,7 @@ nsGlobalWindow::AddEventListenerByIID(nsIDOMEventListener* aListener, return NS_ERROR_FAILURE; } -NS_IMETHODIMP +nsresult nsGlobalWindow::RemoveEventListenerByIID(nsIDOMEventListener* aListener, const nsIID& aIID) { @@ -5600,7 +5594,7 @@ nsGlobalWindow::RemoveEventListenerByIID(nsIDOMEventListener* aListener, return NS_ERROR_FAILURE; } -NS_IMETHODIMP +nsresult nsGlobalWindow::GetListenerManager(PRBool aCreateIfNotFound, nsIEventListenerManager** aResult) { @@ -5619,7 +5613,7 @@ nsGlobalWindow::GetListenerManager(PRBool aCreateIfNotFound, mListenerManager = do_CreateInstance(kEventListenerManagerCID, &rv); NS_ENSURE_SUCCESS(rv, rv); mListenerManager->SetListenerTarget( - NS_STATIC_CAST(nsIDOMEventReceiver*, this)); + NS_STATIC_CAST(nsPIDOMEventTarget*, this)); } NS_ADDREF(*aResult = mListenerManager); @@ -5627,7 +5621,7 @@ nsGlobalWindow::GetListenerManager(PRBool aCreateIfNotFound, return NS_OK; } -NS_IMETHODIMP +nsresult nsGlobalWindow::GetSystemEventGroup(nsIDOMEventGroup **aGroup) { nsCOMPtr manager; diff --git a/mozilla/dom/src/base/nsGlobalWindow.h b/mozilla/dom/src/base/nsGlobalWindow.h index 2c1d0438910..40d32f2789c 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.h +++ b/mozilla/dom/src/base/nsGlobalWindow.h @@ -61,7 +61,7 @@ #include "nsIDocShellTreeItem.h" #include "nsIDOMClientInformation.h" #include "nsIDOMViewCSS.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.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 nsIDOMEventReceiver, + public nsIDOMEventTarget, public nsPIDOMEventTarget, public nsIDOM3EventTarget, public nsIDOMNSEventTarget, @@ -278,15 +278,6 @@ 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(); @@ -321,6 +312,13 @@ 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/mozilla/dom/src/base/nsWindowRoot.cpp b/mozilla/dom/src/base/nsWindowRoot.cpp index 46cd2464dfa..531470a30b5 100644 --- a/mozilla/dom/src/base/nsWindowRoot.cpp +++ b/mozilla/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(nsIDOMEventReceiver*, this)); + mRefCnt.incr(NS_STATIC_CAST(nsIDOMEventTarget*, this)); AddEventListener(NS_LITERAL_STRING("focus"), focusListener, PR_TRUE); AddEventListener(NS_LITERAL_STRING("blur"), focusListener, PR_TRUE); - mRefCnt.decr(NS_STATIC_CAST(nsIDOMEventReceiver*, this)); + mRefCnt.decr(NS_STATIC_CAST(nsIDOMEventTarget*, this)); } nsWindowRoot::~nsWindowRoot() @@ -83,8 +83,7 @@ nsWindowRoot::~nsWindowRoot() NS_IMPL_CYCLE_COLLECTION_2(nsWindowRoot, mListenerManager, mFocusController) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsWindowRoot) - NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventReceiver) - NS_INTERFACE_MAP_ENTRY(nsIDOMEventReceiver) + NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsPIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(nsPIWindowRoot) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) @@ -184,7 +183,7 @@ nsWindowRoot::AddEventListener(const nsAString& aType, return manager->AddEventListenerByType(aListener, aType, flags, nsnull); } -NS_IMETHODIMP +nsresult nsWindowRoot::AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID) { nsCOMPtr manager; @@ -196,7 +195,7 @@ nsWindowRoot::AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& return NS_ERROR_FAILURE; } -NS_IMETHODIMP +nsresult nsWindowRoot::RemoveEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID) { nsCOMPtr manager; @@ -208,7 +207,7 @@ nsWindowRoot::RemoveEventListenerByIID(nsIDOMEventListener *aListener, const nsI return NS_ERROR_FAILURE; } -NS_IMETHODIMP +nsresult nsWindowRoot::GetListenerManager(PRBool aCreateIfNotFound, nsIEventListenerManager** aResult) { @@ -221,7 +220,7 @@ nsWindowRoot::GetListenerManager(PRBool aCreateIfNotFound, mListenerManager = do_CreateInstance(kEventListenerManagerCID, &rv); if (NS_FAILED(rv)) return rv; mListenerManager->SetListenerTarget( - NS_STATIC_CAST(nsIDOMEventReceiver*, this)); + NS_STATIC_CAST(nsPIDOMEventTarget*, this)); } *aResult = mListenerManager; @@ -229,7 +228,7 @@ nsWindowRoot::GetListenerManager(PRBool aCreateIfNotFound, return NS_OK; } -NS_IMETHODIMP +nsresult nsWindowRoot::GetSystemEventGroup(nsIDOMEventGroup **aGroup) { nsCOMPtr manager; diff --git a/mozilla/dom/src/base/nsWindowRoot.h b/mozilla/dom/src/base/nsWindowRoot.h index 37660db1634..145e0d8f1e9 100644 --- a/mozilla/dom/src/base/nsWindowRoot.h +++ b/mozilla/dom/src/base/nsWindowRoot.h @@ -47,7 +47,7 @@ class nsIDOMEvent; class nsEventChainPreVisitor; class nsEventChainPostVisitor; -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.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 nsIDOMEventReceiver, +class nsWindowRoot : public nsIDOMEventTarget, public nsIDOM3EventTarget, public nsIDOMNSEventTarget, public nsPIWindowRoot @@ -76,18 +76,18 @@ public: nsIDOMEvent* aDOMEvent, nsPresContext* aPresContext, nsEventStatus* aEventStatus); - - // 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); + 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); // nsPIWindowRoot NS_IMETHOD GetFocusController(nsIFocusController** aResult); - NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsWindowRoot, nsIDOMEventReceiver) + NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsWindowRoot, nsIDOMEventTarget) protected: // Members diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index 3c70497fd9a..015b63434a4 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -43,7 +43,8 @@ #include "nsIDOMHTMLDocument.h" #include "nsIDOMHTMLElement.h" #include "nsIDOMNSHTMLElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" +#include "nsPIDOMEventTarget.h" #include "nsIEventListenerManager.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" @@ -321,9 +322,9 @@ nsEditor::InstallEventListeners() mCompositionListenerP && mDragListenerP, NS_ERROR_NOT_INITIALIZED); - nsCOMPtr erP = GetDOMEventReceiver(); + nsCOMPtr piTarget = GetPIDOMEventTarget(); - if (!erP) { + if (!piTarget) { RemoveEventListeners(); return NS_ERROR_FAILURE; } @@ -332,9 +333,9 @@ nsEditor::InstallEventListeners() // register the event listeners with the listener manager nsCOMPtr sysGroup; - erP->GetSystemEventGroup(getter_AddRefs(sysGroup)); + piTarget->GetSystemEventGroup(getter_AddRefs(sysGroup)); nsCOMPtr elmP; - erP->GetListenerManager(PR_TRUE, getter_AddRefs(elmP)); + piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(elmP)); if (sysGroup && elmP) { @@ -347,20 +348,20 @@ nsEditor::InstallEventListeners() "failed to register key listener in system group"); } - rv |= erP->AddEventListenerByIID(mMouseListenerP, - NS_GET_IID(nsIDOMMouseListener)); + rv |= piTarget->AddEventListenerByIID(mMouseListenerP, + NS_GET_IID(nsIDOMMouseListener)); - rv |= erP->AddEventListenerByIID(mFocusListenerP, - NS_GET_IID(nsIDOMFocusListener)); + rv |= piTarget->AddEventListenerByIID(mFocusListenerP, + NS_GET_IID(nsIDOMFocusListener)); - rv |= erP->AddEventListenerByIID(mTextListenerP, - NS_GET_IID(nsIDOMTextListener)); + rv |= piTarget->AddEventListenerByIID(mTextListenerP, + NS_GET_IID(nsIDOMTextListener)); - rv |= erP->AddEventListenerByIID(mCompositionListenerP, - NS_GET_IID(nsIDOMCompositionListener)); + rv |= piTarget->AddEventListenerByIID(mCompositionListenerP, + NS_GET_IID(nsIDOMCompositionListener)); - rv |= erP->AddEventListenerByIID(mDragListenerP, - NS_GET_IID(nsIDOMDragListener)); + rv |= piTarget->AddEventListenerByIID(mDragListenerP, + NS_GET_IID(nsIDOMDragListener)); if (NS_FAILED(rv)) { @@ -380,18 +381,18 @@ nsEditor::RemoveEventListeners() return; } - nsCOMPtr erP = GetDOMEventReceiver(); + nsCOMPtr piTarget = GetPIDOMEventTarget(); - if (erP) + if (piTarget) { // unregister the event listeners with the DOM event reveiver if (mKeyListenerP) { nsCOMPtr sysGroup; - erP->GetSystemEventGroup(getter_AddRefs(sysGroup)); + piTarget->GetSystemEventGroup(getter_AddRefs(sysGroup)); nsCOMPtr elmP; - erP->GetListenerManager(PR_TRUE, getter_AddRefs(elmP)); + piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(elmP)); if (sysGroup && elmP) { elmP->RemoveEventListenerByType(mKeyListenerP, @@ -404,32 +405,32 @@ nsEditor::RemoveEventListeners() if (mMouseListenerP) { - erP->RemoveEventListenerByIID(mMouseListenerP, - NS_GET_IID(nsIDOMMouseListener)); + piTarget->RemoveEventListenerByIID(mMouseListenerP, + NS_GET_IID(nsIDOMMouseListener)); } if (mFocusListenerP) { - erP->RemoveEventListenerByIID(mFocusListenerP, - NS_GET_IID(nsIDOMFocusListener)); + piTarget->RemoveEventListenerByIID(mFocusListenerP, + NS_GET_IID(nsIDOMFocusListener)); } if (mTextListenerP) { - erP->RemoveEventListenerByIID(mTextListenerP, - NS_GET_IID(nsIDOMTextListener)); + piTarget->RemoveEventListenerByIID(mTextListenerP, + NS_GET_IID(nsIDOMTextListener)); } if (mCompositionListenerP) { - erP->RemoveEventListenerByIID(mCompositionListenerP, - NS_GET_IID(nsIDOMCompositionListener)); + piTarget->RemoveEventListenerByIID(mCompositionListenerP, + NS_GET_IID(nsIDOMCompositionListener)); } if (mDragListenerP) { - erP->RemoveEventListenerByIID(mDragListenerP, - NS_GET_IID(nsIDOMDragListener)); + piTarget->RemoveEventListenerByIID(mDragListenerP, + NS_GET_IID(nsIDOMDragListener)); } } } @@ -5208,14 +5209,14 @@ nsEditor::HandleInlineSpellCheck(PRInt32 action, aEndOffset) : NS_OK; } -already_AddRefed -nsEditor::GetDOMEventReceiver() +already_AddRefed +nsEditor::GetPIDOMEventTarget() { - nsIDOMEventReceiver *erp = mDOMEventReceiver; - if (erp) + nsPIDOMEventTarget* piTarget = mEventTarget; + if (piTarget) { - NS_ADDREF(erp); - return erp; + NS_ADDREF(piTarget); + return piTarget; } nsIDOMElement *rootElement = GetRoot(); @@ -5227,9 +5228,9 @@ nsEditor::GetDOMEventReceiver() if (content && content->IsNativeAnonymous()) { - mDOMEventReceiver = do_QueryInterface(content->GetParent()); - erp = mDOMEventReceiver; - NS_IF_ADDREF(erp); + mEventTarget = do_QueryInterface(content->GetParent()); + piTarget = mEventTarget; + NS_IF_ADDREF(piTarget); } else { @@ -5238,7 +5239,7 @@ nsEditor::GetDOMEventReceiver() // ourselves, if it exists. if (mDocWeak) { - CallQueryReferent(mDocWeak.get(), &erp); + CallQueryReferent(mDocWeak.get(), &piTarget); } else { @@ -5246,7 +5247,7 @@ nsEditor::GetDOMEventReceiver() } } - return erp; + return piTarget; } nsIDOMElement * diff --git a/mozilla/editor/libeditor/base/nsEditor.h b/mozilla/editor/libeditor/base/nsEditor.h index 9af675fdba1..7ae51af8136 100644 --- a/mozilla/editor/libeditor/base/nsEditor.h +++ b/mozilla/editor/libeditor/base/nsEditor.h @@ -63,6 +63,7 @@ #include "nsSelectionState.h" #include "nsIEditorSpellCheck.h" #include "nsIInlineSpellChecker.h" +#include "nsPIDOMEventTarget.h" class nsIDOMCharacterData; class nsIDOMRange; @@ -83,7 +84,7 @@ class AddStyleSheetTxn; class RemoveStyleSheetTxn; class nsIFile; class nsISelectionController; -class nsIDOMEventReceiver; +class nsIDOMEventTarget; #define kMOZEditorBogusNodeAttr NS_LITERAL_STRING("_moz_editor_bogus_node") #define kMOZEditorBogusNodeValue NS_LITERAL_STRING("TRUE") @@ -574,7 +575,7 @@ public: nsIDOMNode *aEndNode, PRInt32 aEndOffset); - already_AddRefed GetDOMEventReceiver(); + already_AddRefed GetPIDOMEventTarget(); // Fast non-refcounting editor root element accessor nsIDOMElement *GetRoot(); @@ -634,7 +635,7 @@ protected: PRInt8 mDocDirtyState; // -1 = not initialized nsWeakPtr mDocWeak; // weak reference to the nsIDOMDocument // The form field as an event receiver - nsCOMPtr mDOMEventReceiver; + nsCOMPtr mEventTarget; nsString* mPhonetic; diff --git a/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp b/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp index 7ca052d2b92..dd4dde4d560 100644 --- a/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp @@ -57,7 +57,6 @@ #include "nsIDOMNodeList.h" #include "nsIDOMEventTarget.h" -#include "nsIDOMEventReceiver.h" #include "nsIPrefBranch.h" #include "nsIPrefService.h" @@ -403,11 +402,11 @@ nsHTMLEditor::GrabberClicked() mMouseMotionListenerP = new ResizerMouseMotionListener(this); if (!mMouseMotionListenerP) {return NS_ERROR_NULL_POINTER;} - nsCOMPtr erP = GetDOMEventReceiver(); - NS_ENSURE_TRUE(erP, NS_ERROR_FAILURE); + nsCOMPtr piTarget = GetPIDOMEventTarget(); + NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE); - res = erP->AddEventListenerByIID(mMouseMotionListenerP, - NS_GET_IID(nsIDOMMouseMotionListener)); + res = piTarget->AddEventListenerByIID(mMouseMotionListenerP, + NS_GET_IID(nsIDOMMouseMotionListener)); NS_ASSERTION(NS_SUCCEEDED(res), "failed to register mouse motion listener"); } @@ -432,13 +431,14 @@ nsHTMLEditor::EndMoving() DeleteRefToAnonymousNode(mPositioningShadow, rootContent, ps); mPositioningShadow = nsnull; } - nsCOMPtr erP = GetDOMEventReceiver(); + nsCOMPtr piTarget = GetPIDOMEventTarget(); - if (erP && mMouseMotionListenerP) { + if (piTarget && mMouseMotionListenerP) { #ifdef DEBUG nsresult res = #endif - erP->RemoveEventListenerByIID(mMouseMotionListenerP, NS_GET_IID(nsIDOMMouseMotionListener)); + piTarget->RemoveEventListenerByIID(mMouseMotionListenerP, + NS_GET_IID(nsIDOMMouseMotionListener)); NS_ASSERTION(NS_SUCCEEDED(res), "failed to remove mouse motion listener"); } mMouseMotionListenerP = nsnull; diff --git a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp index 3d15f3087ac..814c16ecaa2 100644 --- a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp @@ -51,7 +51,7 @@ #include "nsIDOMDocument.h" #include "nsIDOMAttr.h" #include "nsIDocument.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMNSEvent.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMKeyListener.h" diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp index c7931dd2206..a78bdf4700e 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp @@ -58,7 +58,7 @@ #include "nsIDOMDocument.h" #include "nsIDOMAttr.h" #include "nsIDocument.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMKeyListener.h" @@ -369,9 +369,10 @@ nsHTMLEditor::RemoveEventListeners() return; } - nsCOMPtr erP = GetDOMEventReceiver(); + nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr target = do_QueryInterface(piTarget); - if (erP) + if (piTarget && target) { // Both mMouseMotionListenerP and mResizeEventListenerP can be // registerd with other targets than the DOM event receiver that @@ -384,17 +385,17 @@ nsHTMLEditor::RemoveEventListeners() { // mMouseMotionListenerP might be registerd either by IID or // name, unregister by both. - erP->RemoveEventListenerByIID(mMouseMotionListenerP, - NS_GET_IID(nsIDOMMouseMotionListener)); + piTarget->RemoveEventListenerByIID(mMouseMotionListenerP, + NS_GET_IID(nsIDOMMouseMotionListener)); - erP->RemoveEventListener(NS_LITERAL_STRING("mousemove"), - mMouseMotionListenerP, PR_TRUE); + target->RemoveEventListener(NS_LITERAL_STRING("mousemove"), + mMouseMotionListenerP, PR_TRUE); } if (mResizeEventListenerP) { - erP->RemoveEventListener(NS_LITERAL_STRING("resize"), - mResizeEventListenerP, PR_FALSE); + target->RemoveEventListener(NS_LITERAL_STRING("resize"), + mResizeEventListenerP, PR_FALSE); } } diff --git a/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp b/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp index 9dddeb83f15..be1e0377c0a 100644 --- a/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp @@ -40,7 +40,7 @@ #include "nsIDOMEventTarget.h" #include "nsIDOMNSHTMLElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsPIDOMEventTarget.h" #include "nsIDOMText.h" #include "nsIDOMCSSValue.h" @@ -479,12 +479,14 @@ nsHTMLEditor::HideResizers(void) // don't forget to remove the listeners ! - nsCOMPtr erP = GetDOMEventReceiver(); + nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr target = do_QueryInterface(piTarget); nsresult res; - if (erP && mMouseMotionListenerP) + if (target && mMouseMotionListenerP) { - res = erP->RemoveEventListener(NS_LITERAL_STRING("mousemove"), mMouseMotionListenerP, PR_TRUE); + res = target->RemoveEventListener(NS_LITERAL_STRING("mousemove"), + mMouseMotionListenerP, PR_TRUE); NS_ASSERTION(NS_SUCCEEDED(res), "failed to remove mouse motion listener"); } mMouseMotionListenerP = nsnull; @@ -493,7 +495,7 @@ nsHTMLEditor::HideResizers(void) GetDocument(getter_AddRefs(domDoc)); nsCOMPtr doc = do_QueryInterface(domDoc); if (!doc) { return NS_ERROR_NULL_POINTER; } - nsCOMPtr target = do_QueryInterface(doc->GetWindow()); + target = do_QueryInterface(doc->GetWindow()); if (!target) { return NS_ERROR_NULL_POINTER; } if (mResizeEventListenerP) { @@ -612,11 +614,12 @@ nsHTMLEditor::StartResizing(nsIDOMElement *aHandle) return NS_ERROR_OUT_OF_MEMORY; } - nsCOMPtr erP = GetDOMEventReceiver(); - NS_ENSURE_TRUE(erP, NS_ERROR_FAILURE); + nsCOMPtr piTarget = GetPIDOMEventTarget(); + nsCOMPtr target = do_QueryInterface(piTarget); + NS_ENSURE_TRUE(target, NS_ERROR_FAILURE); - result = erP->AddEventListener(NS_LITERAL_STRING("mousemove"), - mMouseMotionListenerP, PR_TRUE); + result = target->AddEventListener(NS_LITERAL_STRING("mousemove"), + mMouseMotionListenerP, PR_TRUE); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register mouse motion listener"); } diff --git a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp index 402f9b729e3..f5c9476afb9 100644 --- a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp +++ b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp @@ -42,7 +42,7 @@ #include "nsIDocument.h" #include "nsIContent.h" #include "nsIFormControl.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMNSEvent.h" #include "nsIDOMMouseEvent.h" #include "nsISelection.h" diff --git a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp index 21824147244..912660154ab 100644 --- a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp @@ -47,7 +47,7 @@ #include "nsIDOMNodeList.h" #include "nsIDOMDocument.h" #include "nsIDocument.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMMouseListener.h" diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp index 8f769bb7572..761116b9ef8 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp @@ -647,8 +647,8 @@ EmbedPrivate::Destroy(void) // detach our event listeners and release the event receiver DetachListeners(); - if (mEventReceiver) - mEventReceiver = nsnull; + if (mEventTarget) + mEventTarget = nsnull; // destroy our child window mWindow->ReleaseChildren(); @@ -993,7 +993,7 @@ EmbedPrivate::ContentStateChange(void) GetListener(); - if (!mEventReceiver) + if (!mEventTarget) return; AttachListeners(); @@ -1118,7 +1118,7 @@ EmbedPrivate::ChildFocusOut(void) void EmbedPrivate::GetListener(void) { - if (mEventReceiver) + if (mEventTarget) return; nsCOMPtr piWin; @@ -1127,7 +1127,7 @@ EmbedPrivate::GetListener(void) if (!piWin) return; - mEventReceiver = do_QueryInterface(piWin->GetChromeEventHandler()); + mEventTarget = do_QueryInterface(piWin->GetChromeEventHandler()); } // attach key and mouse event listeners @@ -1135,7 +1135,7 @@ EmbedPrivate::GetListener(void) void EmbedPrivate::AttachListeners(void) { - if (!mEventReceiver || mListenersAttached) + if (!mEventTarget || mListenersAttached) return; nsIDOMEventListener *eventListener = @@ -1144,7 +1144,7 @@ EmbedPrivate::AttachListeners(void) // add the key listener nsresult rv; - rv = mEventReceiver->AddEventListenerByIID( + rv = mEventTarget->AddEventListenerByIID( eventListener, NS_GET_IID(nsIDOMKeyListener)); if (NS_FAILED(rv)) { @@ -1152,7 +1152,7 @@ EmbedPrivate::AttachListeners(void) return; } - rv = mEventReceiver->AddEventListenerByIID( + rv = mEventTarget->AddEventListenerByIID( eventListener, NS_GET_IID(nsIDOMMouseListener)); if (NS_FAILED(rv)) { @@ -1160,7 +1160,7 @@ EmbedPrivate::AttachListeners(void) return; } - rv = mEventReceiver->AddEventListenerByIID( + rv = mEventTarget->AddEventListenerByIID( eventListener, NS_GET_IID(nsIDOMUIListener)); if (NS_FAILED(rv)) { @@ -1168,17 +1168,23 @@ EmbedPrivate::AttachListeners(void) return; } - rv = mEventReceiver->AddEventListenerByIID( + rv = mEventTarget->AddEventListenerByIID( eventListener, NS_GET_IID(nsIDOMMouseMotionListener)); if (NS_FAILED(rv)) { NS_WARNING("Failed to add Mouse Motion listener\n"); return; } - 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); + + 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); if (NS_FAILED(rv)) { NS_WARNING("Failed to add Mouse Motion listener\n"); return; @@ -1190,7 +1196,7 @@ EmbedPrivate::AttachListeners(void) void EmbedPrivate::DetachListeners(void) { - if (!mListenersAttached || !mEventReceiver) + if (!mListenersAttached || !mEventTarget) return; nsIDOMEventListener *eventListener = @@ -1198,7 +1204,7 @@ EmbedPrivate::DetachListeners(void) NS_STATIC_CAST(nsIDOMKeyListener *, mEventListener)); nsresult rv; - rv = mEventReceiver->RemoveEventListenerByIID( + rv = mEventTarget->RemoveEventListenerByIID( eventListener, NS_GET_IID(nsIDOMKeyListener)); if (NS_FAILED(rv)) { @@ -1207,7 +1213,7 @@ EmbedPrivate::DetachListeners(void) } rv = - mEventReceiver->RemoveEventListenerByIID( + mEventTarget->RemoveEventListenerByIID( eventListener, NS_GET_IID(nsIDOMMouseListener)); if (NS_FAILED(rv)) { @@ -1215,7 +1221,7 @@ EmbedPrivate::DetachListeners(void) return; } - rv = mEventReceiver->RemoveEventListenerByIID( + rv = mEventTarget->RemoveEventListenerByIID( eventListener, NS_GET_IID(nsIDOMUIListener)); if (NS_FAILED(rv)) { @@ -1223,17 +1229,23 @@ EmbedPrivate::DetachListeners(void) return; } - rv = mEventReceiver->RemoveEventListenerByIID( + rv = mEventTarget->RemoveEventListenerByIID( eventListener, NS_GET_IID(nsIDOMMouseMotionListener)); if (NS_FAILED(rv)) { NS_WARNING("Failed to remove Mouse Motion listener\n"); return; } - 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); + + 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); mListenersAttached = PR_FALSE; } diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h index ac0248b1d46..9e73a2b92a1 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h +++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h @@ -54,7 +54,7 @@ // object. #include "nsIWebBrowserChrome.h" #include "nsIAppShell.h" -#include "nsIDOMEventReceiver.h" +#include "nsPIDOMEventTarget.h" #include "nsVoidArray.h" // app component registration @@ -190,8 +190,7 @@ class EmbedPrivate { nsCOMPtr mNavigation; nsCOMPtr mSessionHistory; - // our event receiver - nsCOMPtr mEventReceiver; + nsCOMPtr mEventTarget; // the currently loaded uri nsString mURI; diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index e31c6dc4c81..bfe4ba3bdf9 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -71,7 +71,7 @@ #include "nsIDOMEvent.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMNSUIEvent.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMNamedNodeMap.h" #include "nsIDOMHTMLInputElement.h" #include "nsIDOMHTMLTextAreaElement.h" @@ -98,15 +98,16 @@ #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 |nsIDOMEventReceiver| via the window root and chrome event handler. +// a |nsPIDOMEventTarget| via the window root and chrome event handler. // static nsresult -GetEventReceiver ( nsWebBrowser* inBrowser, nsIDOMEventReceiver** outEventRcvr ) +GetPIDOMEventTarget( nsWebBrowser* inBrowser, nsPIDOMEventTarget** aTarget) { nsCOMPtr domWindow; inBrowser->GetContentDOMWindow(getter_AddRefs(domWindow)); @@ -116,11 +117,11 @@ GetEventReceiver ( nsWebBrowser* inBrowser, nsIDOMEventReceiver** outEventRcvr ) NS_ENSURE_TRUE(domWindowPrivate, NS_ERROR_FAILURE); nsPIDOMWindow *rootWindow = domWindowPrivate->GetPrivateRoot(); NS_ENSURE_TRUE(rootWindow, NS_ERROR_FAILURE); - nsCOMPtr rcvr = + nsCOMPtr piTarget = do_QueryInterface(rootWindow->GetChromeEventHandler()); - NS_ENSURE_TRUE(rcvr, NS_ERROR_FAILURE); - *outEventRcvr = rcvr; - NS_IF_ADDREF(*outEventRcvr); + NS_ENSURE_TRUE(piTarget, NS_ERROR_FAILURE); + *aTarget = piTarget; + NS_IF_ADDREF(*aTarget); return NS_OK; } @@ -905,10 +906,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 rcvr; - GetEventReceiver(mWebBrowser, getter_AddRefs(rcvr)); - nsCOMPtr rcvrTarget(do_QueryInterface(rcvr)); - mChromeDragHandler->HookupTo(rcvrTarget, NS_STATIC_CAST(nsIWebNavigation*, mWebBrowser)); + nsCOMPtr piTarget; + GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(piTarget)); + nsCOMPtr target(do_QueryInterface(piTarget)); + mChromeDragHandler->HookupTo(target, NS_STATIC_CAST(nsIWebNavigation*, mWebBrowser)); } } @@ -1115,8 +1116,8 @@ ChromeTooltipListener::~ChromeTooltipListener() NS_IMETHODIMP ChromeTooltipListener::AddChromeListeners() { - if ( !mEventReceiver ) - GetEventReceiver(mWebBrowser, getter_AddRefs(mEventReceiver)); + if (!mEventTarget) + GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget)); // Register the appropriate events for tooltips, but only if // the embedding chrome cares. @@ -1143,11 +1144,11 @@ ChromeTooltipListener::AddChromeListeners() NS_IMETHODIMP ChromeTooltipListener::AddTooltipListener() { - if (mEventReceiver) { + if (mEventTarget) { nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this); - 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)); + 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)); // if all 3 succeed, we're a go! if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(rv2) && NS_SUCCEEDED(rv3)) @@ -1171,7 +1172,7 @@ ChromeTooltipListener::RemoveChromeListeners ( ) if ( mTooltipListenerInstalled ) RemoveTooltipListener(); - mEventReceiver = nsnull; + mEventTarget = nsnull; // it really doesn't matter if these fail... return NS_OK; @@ -1188,11 +1189,11 @@ ChromeTooltipListener::RemoveChromeListeners ( ) NS_IMETHODIMP ChromeTooltipListener::RemoveTooltipListener() { - if (mEventReceiver) { + if (mEventTarget) { nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this); - 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)); + 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)); if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(rv2) && NS_SUCCEEDED(rv3)) mTooltipListenerInstalled = PR_FALSE; } @@ -1568,9 +1569,9 @@ ChromeContextMenuListener::~ChromeContextMenuListener() NS_IMETHODIMP ChromeContextMenuListener::AddContextMenuListener() { - if (mEventReceiver) { + if (mEventTarget) { nsIDOMContextMenuListener *pListener = NS_STATIC_CAST(nsIDOMContextMenuListener *, this); - nsresult rv = mEventReceiver->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); + nsresult rv = mEventTarget->AddEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); if (NS_SUCCEEDED(rv)) mContextMenuListenerInstalled = PR_TRUE; } @@ -1587,9 +1588,9 @@ ChromeContextMenuListener::AddContextMenuListener() NS_IMETHODIMP ChromeContextMenuListener::RemoveContextMenuListener() { - if (mEventReceiver) { + if (mEventTarget) { nsIDOMContextMenuListener *pListener = NS_STATIC_CAST(nsIDOMContextMenuListener *, this); - nsresult rv = mEventReceiver->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); + nsresult rv = mEventTarget->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMContextMenuListener)); if (NS_SUCCEEDED(rv)) mContextMenuListenerInstalled = PR_FALSE; } @@ -1607,8 +1608,8 @@ ChromeContextMenuListener::RemoveContextMenuListener() NS_IMETHODIMP ChromeContextMenuListener::AddChromeListeners() { - if ( !mEventReceiver ) - GetEventReceiver(mWebBrowser, getter_AddRefs(mEventReceiver)); + if (!mEventTarget) + GetPIDOMEventTarget(mWebBrowser, getter_AddRefs(mEventTarget)); // Register the appropriate events for context menus, but only if // the embedding chrome cares. @@ -1635,7 +1636,7 @@ ChromeContextMenuListener::RemoveChromeListeners() if ( mContextMenuListenerInstalled ) RemoveContextMenuListener(); - mEventReceiver = nsnull; + mEventTarget = nsnull; // it really doesn't matter if these fail... return NS_OK; diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h index f192dd382f4..3f9be54d1be 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.h @@ -52,7 +52,7 @@ #include "nsIWebBrowserChrome.h" #include "nsIDOMMouseListener.h" #include "nsIDOMDocument.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.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 mEventReceiver; + nsCOMPtr mEventTarget; 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 mEventReceiver; + nsCOMPtr mEventTarget; nsCOMPtr mWebBrowserChrome; }; // class ChromeContextMenuListener diff --git a/mozilla/extensions/python/dom/src/nsPyDOMModule.cpp b/mozilla/extensions/python/dom/src/nsPyDOMModule.cpp index 093298442c8..7264982c211 100644 --- a/mozilla/extensions/python/dom/src/nsPyDOMModule.cpp +++ b/mozilla/extensions/python/dom/src/nsPyDOMModule.cpp @@ -49,7 +49,7 @@ #include "nsIAtomService.h" #include "nsIEventListenerManager.h" #include "nsIScriptTimeoutHandler.h" -#include "nsIDOMEventReceiver.h" +#include "nsPIDOMEventTarget.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 receiver(do_QueryInterface(target)); - if (!receiver) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); + nsCOMPtr piTarget(do_QueryInterface(target)); + if (!piTarget) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); nsCOMPtr manager; - receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); + piTarget->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 receiver(do_QueryInterface(target)); - if (!receiver) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); + nsCOMPtr piTarget(do_QueryInterface(target)); + if (!piTarget) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); nsCOMPtr manager; - receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); + piTarget->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 receiver(do_QueryInterface(target)); - if (!receiver) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); + nsCOMPtr piTarget(do_QueryInterface(target)); + if (!piTarget) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); nsCOMPtr manager; - receiver->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); + piTarget->GetListenerManager(PR_TRUE, getter_AddRefs(manager)); if (!manager) return PyXPCOM_BuildPyException(NS_ERROR_UNEXPECTED); nsresult rv; diff --git a/mozilla/extensions/python/dom/src/nsPyRuntime.cpp b/mozilla/extensions/python/dom/src/nsPyRuntime.cpp index 23eebe822ee..692dab649fc 100644 --- a/mozilla/extensions/python/dom/src/nsPyRuntime.cpp +++ b/mozilla/extensions/python/dom/src/nsPyRuntime.cpp @@ -38,7 +38,7 @@ #include "nsPyContext.h" #include "nsICategoryManager.h" #include "nsIScriptContext.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" extern void init_nsdom(); diff --git a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h index fd45f046902..39dd5fa351c 100755 --- a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h +++ b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationPrivate.h @@ -62,7 +62,7 @@ #include "nsIDOMElementCSSInlineStyle.h" #include "nsIDOMEvent.h" #include "nsIDOMEventGroup.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMHTMLAreaElement.h" #include "nsIDOMHTMLCollection.h" diff --git a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationUtils.cpp b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationUtils.cpp index 7f13070b96d..2da132b66be 100755 --- a/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationUtils.cpp +++ b/mozilla/extensions/spatialnavigation/src/nsSpatialNavigationUtils.cpp @@ -252,14 +252,13 @@ nsresult getEventTargetFromWindow(nsIDOMWindow* aWindow, nsIDOM3EventTarget** aE return NS_ERROR_UNEXPECTED; // assert nsPIDOMEventTarget *chromeEventHandler = privateWindow->GetChromeEventHandler(); - - nsCOMPtr receiver(do_QueryInterface(chromeEventHandler)); - if (!receiver) + + if (!chromeEventHandler) return NS_ERROR_UNEXPECTED; // assert nsCOMPtr systemGroup; - receiver->GetSystemEventGroup(getter_AddRefs(systemGroup)); - nsCOMPtr target(do_QueryInterface(receiver)); + chromeEventHandler->GetSystemEventGroup(getter_AddRefs(systemGroup)); + nsCOMPtr target(do_QueryInterface(chromeEventHandler)); if (!target || !systemGroup) return NS_ERROR_FAILURE; diff --git a/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp index ca73573ac47..27848fcbb54 100644 --- a/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp +++ b/mozilla/extensions/spellcheck/src/mozInlineSpellChecker.cpp @@ -73,7 +73,8 @@ #include "nsIDOMDocument.h" #include "nsIDOMDocumentRange.h" #include "nsIDOMElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" +#include "nsPIDOMEventTarget.h" #include "nsIDOMKeyEvent.h" #include "nsIDOMNode.h" #include "nsIDOMNodeList.h" @@ -622,11 +623,13 @@ mozInlineSpellChecker::RegisterEventListeners() nsresult rv = editor->GetDocument(getter_AddRefs(doc)); NS_ENSURE_SUCCESS(rv, rv); - nsCOMPtr eventReceiver = do_QueryInterface(doc, &rv); + nsCOMPtr piTarget = do_QueryInterface(doc, &rv); NS_ENSURE_SUCCESS(rv, rv); - eventReceiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), NS_GET_IID(nsIDOMMouseListener)); - eventReceiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), NS_GET_IID(nsIDOMKeyListener)); + piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), + NS_GET_IID(nsIDOMMouseListener)); + piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), + NS_GET_IID(nsIDOMKeyListener)); return NS_OK; } @@ -645,11 +648,13 @@ mozInlineSpellChecker::UnregisterEventListeners() editor->GetDocument(getter_AddRefs(doc)); NS_ENSURE_TRUE(doc, NS_ERROR_NULL_POINTER); - nsCOMPtr eventReceiver = do_QueryInterface(doc); - NS_ENSURE_TRUE(eventReceiver, NS_ERROR_NULL_POINTER); + nsCOMPtr piTarget = do_QueryInterface(doc); + NS_ENSURE_TRUE(piTarget, NS_ERROR_NULL_POINTER); - eventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), NS_GET_IID(nsIDOMMouseListener)); - eventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), NS_GET_IID(nsIDOMKeyListener)); + piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, this), + NS_GET_IID(nsIDOMMouseListener)); + piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, this), + NS_GET_IID(nsIDOMKeyListener)); return NS_OK; } diff --git a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp index cdcb48d0ca9..e1ca0b30f2e 100644 --- a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp +++ b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp @@ -97,7 +97,8 @@ #include "nsIPrivateTextEvent.h" #include "nsIPrivateCompositionEvent.h" #include "nsGUIEvent.h" -#include "nsIDOMEventReceiver.h" +#include "nsPIDOMEventTarget.h" +#include "nsIDOMEventTarget.h" #include "nsIDOM3EventTarget.h" #include "nsIDOMEventGroup.h" @@ -2271,10 +2272,10 @@ nsTypeAheadFind::RemoveWindowListeners(nsIDOMWindow *aDOMWin) } // Use capturing, otherwise the normal find next will get activated when ours should - nsCOMPtr receiver(do_QueryInterface(chromeEventHandler)); + nsCOMPtr piTarget(do_QueryInterface(chromeEventHandler)); nsCOMPtr systemGroup; - receiver->GetSystemEventGroup(getter_AddRefs(systemGroup)); - nsCOMPtr target(do_QueryInterface(receiver)); + piTarget->GetSystemEventGroup(getter_AddRefs(systemGroup)); + nsCOMPtr target(do_QueryInterface(piTarget)); target->RemoveGroupedEventListener(NS_LITERAL_STRING("keypress"), NS_STATIC_CAST(nsIDOMKeyListener*, this), @@ -2309,11 +2310,9 @@ nsTypeAheadFind::RemoveWindowListeners(nsIDOMWindow *aDOMWin) PR_TRUE); // Remove DOM Text listener for IME text events - nsCOMPtr chromeEventReceiver = - do_QueryInterface(chromeEventHandler); - chromeEventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMTextListener*, this), + piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMTextListener*, this), NS_GET_IID(nsIDOMTextListener)); - chromeEventReceiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMCompositionListener*, this), + piTarget->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMCompositionListener*, this), NS_GET_IID(nsIDOMCompositionListener)); } @@ -2328,10 +2327,10 @@ nsTypeAheadFind::AttachWindowListeners(nsIDOMWindow *aDOMWin) } // Use capturing, otherwise the normal find next will get activated when ours should - nsCOMPtr receiver(do_QueryInterface(chromeEventHandler)); + nsCOMPtr piTarget(do_QueryInterface(chromeEventHandler)); nsCOMPtr systemGroup; - receiver->GetSystemEventGroup(getter_AddRefs(systemGroup)); - nsCOMPtr target(do_QueryInterface(receiver)); + piTarget->GetSystemEventGroup(getter_AddRefs(systemGroup)); + nsCOMPtr target(do_QueryInterface(piTarget)); target->AddGroupedEventListener(NS_LITERAL_STRING("keypress"), NS_STATIC_CAST(nsIDOMKeyListener*, this), @@ -2362,11 +2361,9 @@ nsTypeAheadFind::AttachWindowListeners(nsIDOMWindow *aDOMWin) PR_TRUE); // Add DOM Text listener for IME text events - nsCOMPtr chromeEventReceiver = - do_QueryInterface(chromeEventHandler); - chromeEventReceiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMTextListener*, this), + piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMTextListener*, this), NS_GET_IID(nsIDOMTextListener)); - chromeEventReceiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMCompositionListener*, this), + piTarget->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMCompositionListener*, this), NS_GET_IID(nsIDOMCompositionListener)); } diff --git a/mozilla/extensions/xforms/nsXFormsInstanceElement.cpp b/mozilla/extensions/xforms/nsXFormsInstanceElement.cpp index 87416714248..a78f2a887b7 100644 --- a/mozilla/extensions/xforms/nsXFormsInstanceElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsInstanceElement.cpp @@ -44,7 +44,7 @@ #include "nsMemory.h" #include "nsXFormsAtoms.h" #include "nsString.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMDOMImplementation.h" #include "nsIXTFElementWrapper.h" #include "nsXFormsUtils.h" diff --git a/mozilla/extensions/xforms/nsXFormsModelElement.cpp b/mozilla/extensions/xforms/nsXFormsModelElement.cpp index 4d024e59b5e..fa701188460 100644 --- a/mozilla/extensions/xforms/nsXFormsModelElement.cpp +++ b/mozilla/extensions/xforms/nsXFormsModelElement.cpp @@ -53,7 +53,7 @@ #include "nsIDOMEvent.h" #include "nsIDOMDOMImplementation.h" #include "nsIDOMXMLDocument.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMXPathResult.h" #include "nsIDOMXPathEvaluator.h" #include "nsIXPathEvaluatorInternal.h" diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index 96e84b6ce6b..a0c9307f811 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -175,7 +175,7 @@ static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printset #include "nsIDocument.h" //focus -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMFocusListener.h" #include "nsISelectionController.h" @@ -751,17 +751,13 @@ DocumentViewerImpl::InitPresentationStuff(PRBool aDoInitialReflow) // mFocusListener is a strong reference mFocusListener = focusListener; - // 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)); + if (mDocument) { + rv = mDocument->AddEventListenerByIID(mFocusListener, + NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener"); if (mOldFocusListener) { - rv = erP->RemoveEventListenerByIID(mOldFocusListener, - NS_GET_IID(nsIDOMFocusListener)); + rv = mDocument->RemoveEventListenerByIID(mOldFocusListener, + NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to remove focus listener"); } } @@ -1354,15 +1350,9 @@ DocumentViewerImpl::Open(nsISupports *aState, nsISHEntry *aSHEntry) SyncParentSubDocMap(); - 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)); - } + if (mFocusListener && mDocument) { + mDocument->AddEventListenerByIID(mFocusListener, + NS_GET_IID(nsIDOMFocusListener)); } // XXX re-enable image animations once that works correctly @@ -1416,15 +1406,9 @@ DocumentViewerImpl::Close(nsISHEntry *aSHEntry) mDocument->Destroy(); } - 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)); - } + if (mFocusListener && mDocument) { + mDocument->RemoveEventListenerByIID(mFocusListener, + NS_GET_IID(nsIDOMFocusListener)); } return NS_OK; @@ -1758,13 +1742,9 @@ DocumentViewerImpl::SetDOMDocument(nsIDOMDocument *aDocument) mPresShell->BeginObservingDocument(); // Register the focus listener on the new document - - nsCOMPtr erP = do_QueryInterface(mDocument, &rv); - NS_ASSERTION(erP, "No event receiver in document!"); - - if (erP) { - rv = erP->AddEventListenerByIID(mFocusListener, - NS_GET_IID(nsIDOMFocusListener)); + if (mDocument) { + rv = mDocument->AddEventListenerByIID(mFocusListener, + NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener"); } } diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 840110ad3c8..0c00c1bbfb3 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -39,7 +39,7 @@ #include "nsCOMPtr.h" #include "nsReadableUtils.h" #include "nsComboboxControlFrame.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsFrameManager.h" #include "nsFormControlFrame.h" #include "nsGfxButtonControlFrame.h" @@ -1035,14 +1035,11 @@ 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. - 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)); - } + mButtonListener = new nsComboButtonListener(this); + if (!mButtonListener) + return NS_ERROR_OUT_OF_MEMORY; + mButtonContent->AddEventListenerByIID(mButtonListener, + NS_GET_IID(nsIDOMMouseListener)); mButtonContent->SetAttr(kNameSpaceID_None, nsGkAtoms::type, NS_LITERAL_STRING("button"), PR_FALSE); diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index 4f8ac1e7065..887e0eed051 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -63,7 +63,7 @@ #include "nsIFilePicker.h" #include "nsIDOMMouseEvent.h" #include "nsINodeInfo.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsILocalFile.h" #include "nsIFileControlElement.h" #include "nsNodeInfoManager.h" @@ -116,15 +116,13 @@ nsFileControlFrame::Destroy() mTextFrame = nsnull; // remove mMouseListener as a mouse event listener (bug 40533, bug 355931) if (mBrowse) { - nsCOMPtr receiver(do_QueryInterface(mBrowse)); - receiver->RemoveEventListenerByIID(mMouseListener, + mBrowse->RemoveEventListenerByIID(mMouseListener, NS_GET_IID(nsIDOMMouseListener)); nsContentUtils::DestroyAnonymousContent(&mBrowse); } if (mTextContent) { - nsCOMPtr receiver(do_QueryInterface(mTextContent)); - receiver->RemoveEventListenerByIID(mMouseListener, - NS_GET_IID(nsIDOMMouseListener)); + mTextContent->RemoveEventListenerByIID(mMouseListener, + NS_GET_IID(nsIDOMMouseListener)); nsContentUtils::DestroyAnonymousContent(&mTextContent); } @@ -171,9 +169,8 @@ 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 - nsCOMPtr receiver = do_QueryInterface(mTextContent); - receiver->AddEventListenerByIID(mMouseListener, - NS_GET_IID(nsIDOMMouseListener)); + mTextContent->AddEventListenerByIID(mMouseListener, + NS_GET_IID(nsIDOMMouseListener)); // Create the browse button NS_NewHTMLElement(getter_AddRefs(mBrowse), nodeInfo); @@ -198,9 +195,8 @@ 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 - receiver = do_QueryInterface(mBrowse); - receiver->AddEventListenerByIID(mMouseListener, - NS_GET_IID(nsIDOMMouseListener)); + mBrowse->AddEventListenerByIID(mMouseListener, + NS_GET_IID(nsIDOMMouseListener)); SyncAttr(kNameSpaceID_None, nsGkAtoms::size, SYNC_TEXT); SyncAttr(kNameSpaceID_None, nsGkAtoms::disabled, SYNC_BOTH); diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp index 7b82180266b..bc2959255a4 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.cpp +++ b/mozilla/layout/forms/nsIsIndexFrame.cpp @@ -71,7 +71,7 @@ #include "nsIDOMKeyEvent.h" #include "nsIFormControlFrame.h" #include "nsINodeInfo.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsContentCID.h" #include "nsNodeInfoManager.h" #include "nsContentCreatorFunctions.h" @@ -98,8 +98,7 @@ nsIsIndexFrame::Destroy() { // remove ourself as a listener of the text control (bug 40533) if (mInputContent) { - nsCOMPtr receiver(do_QueryInterface(mInputContent)); - receiver->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMKeyListener)); + mInputContent->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMKeyListener)); nsContentUtils::DestroyAnonymousContent(&mInputContent); } nsContentUtils::DestroyAnonymousContent(&mTextContent); @@ -225,8 +224,7 @@ nsIsIndexFrame::CreateAnonymousContent(nsTArray& aElements) return NS_ERROR_OUT_OF_MEMORY; // Register as an event listener to submit on Enter press - nsCOMPtr receiver(do_QueryInterface(mInputContent)); - receiver->AddEventListenerByIID(this, NS_GET_IID(nsIDOMKeyListener)); + mInputContent->AddEventListenerByIID(this, NS_GET_IID(nsIDOMKeyListener)); // Create an hr NS_NewHTMLElement(getter_AddRefs(mPostHr), hrInfo); diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index c9b680f882e..ea52a80cd69 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -60,7 +60,7 @@ #include "nsWidgetsCID.h" #include "nsIPresShell.h" #include "nsHTMLParts.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.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 - nsCOMPtr receiver(do_QueryInterface(mContent)); + ENSURE_TRUE(mContent); // Clear the frame pointer on our event listener, just in case the // event listener can outlive the frame. mEventListener->SetFrame(nsnull); - receiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, + mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, mEventListener), NS_GET_IID(nsIDOMMouseListener)); - receiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, + mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, mEventListener), NS_GET_IID(nsIDOMMouseMotionListener)); - receiver->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, + mContent->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 - nsCOMPtr receiver(do_QueryInterface(mContent)); + NS_ENSURE_STATE(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; - receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, + mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*, mEventListener), NS_GET_IID(nsIDOMMouseListener)); - receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, + mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*, mEventListener), NS_GET_IID(nsIDOMMouseMotionListener)); - receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, + mContent->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMKeyListener*, mEventListener), NS_GET_IID(nsIDOMKeyListener)); diff --git a/mozilla/layout/forms/nsTextControlFrame.cpp b/mozilla/layout/forms/nsTextControlFrame.cpp index 0a5042ea5e0..7d832ecf968 100644 --- a/mozilla/layout/forms/nsTextControlFrame.cpp +++ b/mozilla/layout/forms/nsTextControlFrame.cpp @@ -84,7 +84,7 @@ #include "nsBoxLayoutState.h" //for keylistener for "return" check #include "nsIPrivateDOMEvent.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.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,14 +1134,13 @@ nsTextControlFrame::PreDestroy() nsFormControlFrame::RegUnRegAccessKey(NS_STATIC_CAST(nsIFrame*, this), PR_FALSE); if (mTextListener) { - nsCOMPtr erP = do_QueryInterface(mContent); - if (erP) + if (mContent) { - erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), NS_GET_IID(nsIDOMFocusListener)); + mContent->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), NS_GET_IID(nsIDOMFocusListener)); } nsCOMPtr systemGroup; - erP->GetSystemEventGroup(getter_AddRefs(systemGroup)); + mContent->GetSystemEventGroup(getter_AddRefs(systemGroup)); nsCOMPtr dom3Targ = do_QueryInterface(mContent); if (dom3Targ) { // cast because of ambiguous base @@ -2732,10 +2731,10 @@ nsTextControlFrame::SetInitialChildList(nsIAtom* aListName, } //register focus and key listeners - nsCOMPtr erP = do_QueryInterface(mContent); - if (erP) { + if (mContent) { // register the event listeners with the DOM event receiver - rv = erP->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *,mTextListener), NS_GET_IID(nsIDOMFocusListener)); + rv = mContent->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()) @@ -2743,7 +2742,7 @@ nsTextControlFrame::SetInitialChildList(nsIAtom* aListName, } nsCOMPtr systemGroup; - erP->GetSystemEventGroup(getter_AddRefs(systemGroup)); + mContent->GetSystemEventGroup(getter_AddRefs(systemGroup)); nsCOMPtr dom3Targ = do_QueryInterface(mContent); if (dom3Targ) { // cast because of ambiguous base diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp index 269235b5b6d..537b00bf007 100644 --- a/mozilla/layout/generic/nsImageMap.cpp +++ b/mozilla/layout/generic/nsImageMap.cpp @@ -57,7 +57,7 @@ #include "nsIDocument.h" #include "nsINameSpaceManager.h" #include "nsGkAtoms.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIPresShell.h" #include "nsIFrame.h" #include "nsFrameManager.h" @@ -753,10 +753,7 @@ nsImageMap::FreeAreas() nsCOMPtr areaContent; area->GetArea(getter_AddRefs(areaContent)); if (areaContent) { - nsCOMPtr rec(do_QueryInterface(areaContent)); - if (rec) { - rec->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMFocusListener)); - } + areaContent->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMFocusListener)); } delete area; } @@ -878,10 +875,7 @@ nsImageMap::AddArea(nsIContent* aArea) return NS_ERROR_OUT_OF_MEMORY; //Add focus listener to track area focus changes - nsCOMPtr rec(do_QueryInterface(aArea)); - if (rec) { - rec->AddEventListenerByIID(this, NS_GET_IID(nsIDOMFocusListener)); - } + aArea->AddEventListenerByIID(this, NS_GET_IID(nsIDOMFocusListener)); mPresShell->FrameManager()->SetPrimaryFrameFor(aArea, mImageFrame); aArea->SetMayHaveFrame(PR_TRUE); diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 1ac71678ae0..54ff3245723 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -90,7 +90,7 @@ #include "nsIDOMFocusListener.h" #include "nsIDOMContextMenuListener.h" #include "nsIDOMDragListener.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMNSEvent.h" #include "nsIPrivateDOMEvent.h" #include "nsIDocumentEncoder.h" @@ -3103,32 +3103,32 @@ nsPluginInstanceOwner::Destroy() NS_RELEASE(mCXMenuListener); } - nsCOMPtr receiver(do_QueryInterface(mContent)); - if (receiver) { + nsCOMPtr target(do_QueryInterface(mContent)); + if (target) { nsCOMPtr listener; QueryInterface(NS_GET_IID(nsIDOMEventListener), getter_AddRefs(listener)); // Unregister focus event listener - receiver->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMFocusListener)); + mContent->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMFocusListener)); // Unregister mouse event listener - receiver->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseListener)); + mContent->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseListener)); // now for the mouse motion listener - receiver->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseMotionListener)); + mContent->RemoveEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseMotionListener)); // Unregister key event listener; - 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); + 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); // Unregister drag event listener; - 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); + 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); } // Unregister scroll position listener @@ -3290,32 +3290,32 @@ nsresult nsPluginInstanceOwner::Init(nsPresContext* aPresContext, mCXMenuListener->Init(aContent); } - nsCOMPtr receiver(do_QueryInterface(mContent)); - if (receiver) { + nsCOMPtr target(do_QueryInterface(mContent)); + if (target) { nsCOMPtr listener; QueryInterface(NS_GET_IID(nsIDOMEventListener), getter_AddRefs(listener)); // Register focus listener - receiver->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMFocusListener)); + mContent->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMFocusListener)); // Register mouse listener - receiver->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseListener)); + mContent->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseListener)); // now do the mouse motion listener - receiver->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseMotionListener)); + mContent->AddEventListenerByIID(listener, NS_GET_IID(nsIDOMMouseMotionListener)); // Register key listener - 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); + 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); // Register drag listener - 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); + 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); } // Register scroll position listener diff --git a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp index cc549d86d0b..f5a1373dccb 100644 --- a/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp +++ b/mozilla/layout/mathml/base/src/nsMathMLmactionFrame.cpp @@ -56,7 +56,7 @@ #include "nsIInterfaceRequestorUtils.h" #include "nsIDOMElement.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMMouseListener.h" #include "nsMathMLmactionFrame.h" @@ -88,9 +88,8 @@ 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); - nsCOMPtr receiver(do_QueryInterface(mContent)); - receiver->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); + // printf("maction:%p unregistering as mouse event listener ...\n", this); + mContent->RemoveEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); } NS_IMETHODIMP @@ -239,8 +238,7 @@ nsMathMLmactionFrame::SetInitialChildList(nsIAtom* aListName, else { // register us as a mouse event listener ... // printf("maction:%p registering as mouse event listener ...\n", this); - nsCOMPtr receiver(do_QueryInterface(mContent)); - receiver->AddEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); + mContent->AddEventListenerByIID(this, NS_GET_IID(nsIDOMMouseListener)); } return rv; } diff --git a/mozilla/layout/printing/nsPrintEngine.cpp b/mozilla/layout/printing/nsPrintEngine.cpp index 64969ee6d8d..4b3b439a778 100644 --- a/mozilla/layout/printing/nsPrintEngine.cpp +++ b/mozilla/layout/printing/nsPrintEngine.cpp @@ -99,7 +99,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro #include "nsIDocument.h" // Focus -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMFocusListener.h" #include "nsISelectionController.h" diff --git a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp index ce8560c3cc9..32b9a97a009 100644 --- a/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp +++ b/mozilla/layout/xul/base/src/nsListBoxBodyFrame.cpp @@ -49,7 +49,7 @@ #include "nsIContent.h" #include "nsINameSpaceManager.h" #include "nsIDocument.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMMouseEvent.h" #include "nsIDOMElement.h" #include "nsIDOMNodeList.h" diff --git a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp index 18b33d6f5b8..f0b3a31229b 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp @@ -49,7 +49,7 @@ #include "nsCSSRendering.h" #include "nsINameSpaceManager.h" #include "nsIDocument.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.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/mozilla/layout/xul/base/src/nsMenuBarFrame.h b/mozilla/layout/xul/base/src/nsMenuBarFrame.h index f31c234973b..2089d1e2922 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarFrame.h +++ b/mozilla/layout/xul/base/src/nsMenuBarFrame.h @@ -156,7 +156,7 @@ protected: // if nothing has happened since the last click. Otherwise, contains nsnull. nsIMenuFrame* mRecentRollupMenu; - nsIDOMEventReceiver* mTarget; + nsIDOMEventTarget* mTarget; private: PRBool mCaretWasVisible; diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp index 83e22907623..7e042f3a7b8 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp @@ -41,7 +41,7 @@ #include "nsMenuBarListener.h" #include "nsMenuBarFrame.h" #include "nsIDOMKeyListener.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMEventListener.h" #include "nsIDOMNSUIEvent.h" #include "nsIDOMNSEvent.h" diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.h b/mozilla/layout/xul/base/src/nsMenuBarListener.h index 957eb025872..bce41f8c7b7 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.h +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.h @@ -42,7 +42,7 @@ #include "nsIDOMMouseListener.h" #include "nsIDOMKeyListener.h" #include "nsIDOMFocusListener.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" class nsMenuBarFrame; class nsPresContext; diff --git a/mozilla/layout/xul/base/src/nsMenuDismissalListener.h b/mozilla/layout/xul/base/src/nsMenuDismissalListener.h index 1c2313fc7a5..b89b2ea17d8 100644 --- a/mozilla/layout/xul/base/src/nsMenuDismissalListener.h +++ b/mozilla/layout/xul/base/src/nsMenuDismissalListener.h @@ -42,7 +42,7 @@ #include "nsIDOMMouseListener.h" #include "nsIRollupListener.h" #include "nsIMenuRollup.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsCOMPtr.h" class nsIMenuParent; diff --git a/mozilla/layout/xul/base/src/nsMenuListener.cpp b/mozilla/layout/xul/base/src/nsMenuListener.cpp index ab5a06c955b..ecb2f15cd1e 100644 --- a/mozilla/layout/xul/base/src/nsMenuListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuListener.cpp @@ -41,7 +41,7 @@ #include "nsMenuListener.h" #include "nsMenuBarFrame.h" #include "nsIDOMKeyListener.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMEventListener.h" #include "nsIDOMNSUIEvent.h" #include "nsGUIEvent.h" diff --git a/mozilla/layout/xul/base/src/nsMenuListener.h b/mozilla/layout/xul/base/src/nsMenuListener.h index 91ddc7c6f1b..282d68b77e4 100644 --- a/mozilla/layout/xul/base/src/nsMenuListener.h +++ b/mozilla/layout/xul/base/src/nsMenuListener.h @@ -41,7 +41,7 @@ #include "nsIDOMMouseListener.h" #include "nsIDOMKeyListener.h" #include "nsIDOMFocusListener.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" class nsIMenuParent; class nsPresContext; diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp index 8f805800a65..e7d3ed16dfa 100644 --- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -1788,7 +1788,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/mozilla/layout/xul/base/src/nsMenuPopupFrame.h b/mozilla/layout/xul/base/src/nsMenuPopupFrame.h index 896833f3532..717d593040d 100644 --- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.h +++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.h @@ -48,7 +48,7 @@ #include "prtypes.h" #include "nsIAtom.h" #include "nsCOMPtr.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.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. - nsIDOMEventReceiver* mTarget; + nsIDOMEventTarget* mTarget; nsIMenuFrame* mTimerMenu; // A menu awaiting closure. nsCOMPtr mCloseTimer; // Close timer. diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp index a1bb798f80f..32402d02e47 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp @@ -54,7 +54,7 @@ #include "nsHTMLParts.h" #include "nsIPresShell.h" #include "nsCSSRendering.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIViewManager.h" #include "nsIWidget.h" #include "nsIDOMMouseEvent.h" @@ -963,10 +963,8 @@ nsSliderFrame::AddListener() nsIFrame* thumbFrame = mFrames.FirstChild(); if (thumbFrame) { - nsCOMPtr - receiver(do_QueryInterface(thumbFrame->GetContent())); - - receiver->AddEventListenerByIID(mMediator, NS_GET_IID(nsIDOMMouseListener)); + thumbFrame->GetContent()-> + AddEventListenerByIID(mMediator, NS_GET_IID(nsIDOMMouseListener)); } } @@ -979,10 +977,8 @@ nsSliderFrame::RemoveListener() if (!thumbFrame) return; - nsCOMPtr - receiver(do_QueryInterface(thumbFrame->GetContent())); - - receiver->RemoveEventListenerByIID(mMediator, NS_GET_IID(nsIDOMMouseListener)); + thumbFrame->GetContent()-> + RemoveEventListenerByIID(mMediator, NS_GET_IID(nsIDOMMouseListener)); } NS_IMETHODIMP diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp index 397b12ae1d5..781fa88753b 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp @@ -55,7 +55,7 @@ #include "nsScrollbarButtonFrame.h" #include "nsIDOMMouseListener.h" #include "nsIDOMMouseMotionListener.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsIScrollableView.h" @@ -623,21 +623,23 @@ nsSplitterFrameInner::MouseDrag(nsPresContext* aPresContext, nsGUIEvent* aEvent) void nsSplitterFrameInner::AddListener(nsPresContext* aPresContext) { - 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)); + mOuter->GetContent()-> + AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,this), + NS_GET_IID(nsIDOMMouseListener)); + mOuter->GetContent()-> + AddEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,this), + NS_GET_IID(nsIDOMMouseMotionListener)); } void nsSplitterFrameInner::RemoveListener() { - 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)); + mOuter->GetContent()-> + RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseListener*,this), + NS_GET_IID(nsIDOMMouseListener)); + mOuter->GetContent()-> + RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMMouseMotionListener*,this), + NS_GET_IID(nsIDOMMouseMotionListener)); } /* diff --git a/mozilla/minimo/components/softkb/nsSoftKeyBoard.cpp b/mozilla/minimo/components/softkb/nsSoftKeyBoard.cpp index ded5f587f04..cd28d5cdae1 100755 --- a/mozilla/minimo/components/softkb/nsSoftKeyBoard.cpp +++ b/mozilla/minimo/components/softkb/nsSoftKeyBoard.cpp @@ -65,7 +65,6 @@ #include "nsIDOM3EventTarget.h" #include "nsIDOMEventGroup.h" #include "nsPIDOMWindow.h" -#include "nsIDOMEventReceiver.h" #include "nsIDOMEvent.h" #include "nsIDOMNSEvent.h" @@ -744,15 +743,15 @@ nsSoftKeyBoard::Init(nsIDOMWindow *aWindow) return NS_ERROR_UNEXPECTED; nsIChromeEventHandler *chromeEventHandler = privateWindow->GetChromeEventHandler(); - nsCOMPtr receiver(do_QueryInterface(chromeEventHandler)); - if (!receiver) + nsCOMPtr target(do_QueryInterface(chromeEventHandler)); + if (!target) return NS_ERROR_UNEXPECTED; - receiver->AddEventListener(NS_LITERAL_STRING("focus"), this, PR_TRUE); - receiver->AddEventListener(NS_LITERAL_STRING("blur"), this, PR_TRUE); - receiver->AddEventListener(NS_LITERAL_STRING("keypress"), this, PR_TRUE); + target->AddEventListener(NS_LITERAL_STRING("focus"), this, PR_TRUE); + target->AddEventListener(NS_LITERAL_STRING("blur"), this, PR_TRUE); + target->AddEventListener(NS_LITERAL_STRING("keypress"), this, PR_TRUE); - receiver->AddEventListener(NS_LITERAL_STRING("click"), this, PR_TRUE); + target->AddEventListener(NS_LITERAL_STRING("click"), this, PR_TRUE); return NS_OK; } @@ -766,14 +765,14 @@ nsSoftKeyBoard::Shutdown() return NS_ERROR_UNEXPECTED; nsIChromeEventHandler *chromeEventHandler = privateWindow->GetChromeEventHandler(); - nsCOMPtr receiver(do_QueryInterface(chromeEventHandler)); - if (!receiver) + nsCOMPtr target(do_QueryInterface(chromeEventHandler)); + if (!target) return NS_ERROR_UNEXPECTED; - receiver->RemoveEventListener(NS_LITERAL_STRING("focus"), this, PR_TRUE); - receiver->RemoveEventListener(NS_LITERAL_STRING("blur"), this, PR_TRUE); - receiver->RemoveEventListener(NS_LITERAL_STRING("keypress"), this, PR_TRUE); - receiver->RemoveEventListener(NS_LITERAL_STRING("click"), this, PR_TRUE); + target->RemoveEventListener(NS_LITERAL_STRING("focus"), this, PR_TRUE); + target->RemoveEventListener(NS_LITERAL_STRING("blur"), this, PR_TRUE); + target->RemoveEventListener(NS_LITERAL_STRING("keypress"), this, PR_TRUE); + target->RemoveEventListener(NS_LITERAL_STRING("click"), this, PR_TRUE); mTopWindow = nsnull; diff --git a/mozilla/widget/src/cocoa/nsMenuItemX.mm b/mozilla/widget/src/cocoa/nsMenuItemX.mm index e8f1f0f6cd2..55fd141562b 100644 --- a/mozilla/widget/src/cocoa/nsMenuItemX.mm +++ b/mozilla/widget/src/cocoa/nsMenuItemX.mm @@ -52,7 +52,7 @@ #include "nsIDocument.h" #include "nsIDOMDocument.h" #include "nsIPrivateDOMEvent.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMDocumentEvent.h" #include "nsMenuItemIconX.h" diff --git a/mozilla/widget/src/mac/nsMenuItemX.cpp b/mozilla/widget/src/mac/nsMenuItemX.cpp index c4fc26d5776..c918595bc50 100644 --- a/mozilla/widget/src/mac/nsMenuItemX.cpp +++ b/mozilla/widget/src/mac/nsMenuItemX.cpp @@ -56,7 +56,7 @@ #include "nsIDocument.h" #include "nsIDOMDocument.h" #include "nsIPrivateDOMEvent.h" -#include "nsIDOMEventReceiver.h" +#include "nsIDOMEventTarget.h" #include "nsIDOMDocumentEvent.h" #include "nsGUIEvent.h" diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index 43ef5adb0f3..a822c4910b8 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -56,7 +56,6 @@ #include "nsEscape.h" #include "nsPIDOMWindow.h" #include "nsIDOMEventTarget.h" -#include "nsIDOMEventReceiver.h" #include "nsIPrivateDOMEvent.h" #include "nsIEventListenerManager.h" #include "nsIDOMFocusListener.h"