Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removing GetNewListenerManager() from nsIDOMEventReceiver since it's not needed any more, no real code changes. r=pollmann@netscape.com, rs=vidur@netscape.com

Browse Source
This commit is contained in:
jst%netscape.com 2001-05-17 06:04:04 +00:00
parent d692a32b9a
commit a31bb729c2
14 changed files with 18 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
content/base/src/nsDocument.cpp
View File

@ -2793,7 +2793,7 @@ nsresult nsDocument::GetListenerManager(nsIEventListenerManager **aInstancePtrRe
if (nsnull != mListenerManager) {
return mListenerManager->QueryInterface(NS_GET_IID(nsIEventListenerManager), (void**) aInstancePtrResult);
}
if (NS_OK == GetNewListenerManager(aInstancePtrResult)) {
if (NS_OK == NS_NewEventListenerManager(aInstancePtrResult)) {
mListenerManager = *aInstancePtrResult;
NS_ADDREF(mListenerManager);
mListenerManager->SetListenerTarget(NS_STATIC_CAST(nsIDocument*,this));
@ -2802,11 +2802,6 @@ nsresult nsDocument::GetListenerManager(nsIEventListenerManager **aInstancePtrRe
return NS_ERROR_FAILURE;
}
nsresult nsDocument::GetNewListenerManager(nsIEventListenerManager **aInstancePtrResult)
{
return NS_NewEventListenerManager(aInstancePtrResult);
}
nsresult nsDocument::HandleEvent(nsIDOMEvent *aEvent)
{
return DispatchEvent(aEvent);

1
content/base/src/nsDocument.h
View File

@ -485,7 +485,6 @@ public:
NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener,
const nsIID& aIID);
NS_IMETHOD GetListenerManager(nsIEventListenerManager** aInstancePtrResult);
NS_IMETHOD GetNewListenerManager(nsIEventListenerManager **aInstancePtrResult);
NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent);
// nsIDiskDocument inteface

3
content/base/src/nsGenericDOMDataNode.h
View File

@ -402,9 +402,6 @@ struct nsGenericDOMDataNode {
NS_IMETHOD GetListenerManager(nsIEventListenerManager** aResult) { \
return _g.GetListenerManager(aResult); \
} \
NS_IMETHOD GetNewListenerManager(nsIEventListenerManager** aResult) { \
return _g.GetNewListenerManager(aResult); \
} \
NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent) { \
return _g.HandleEvent(aEvent); \
} \

9
content/events/src/nsEventListenerManager.cpp
View File

@ -164,7 +164,8 @@ NS_IMPL_RELEASE(nsEventListenerManager)
// results of the partial aggregation we began using nsGenericElement
// and nsGenericDOMDataNode. We should look for a better long term
// solution. -joki
nsresult nsEventListenerManager::QueryInterface(REFNSIID aIID, void** aInstancePtr)
NS_IMETHODIMP
nsEventListenerManager::QueryInterface(REFNSIID aIID, void** aInstancePtr)
{
if (nsnull == aInstancePtr) {
return NS_ERROR_NULL_POINTER;
@ -2547,12 +2548,6 @@ nsEventListenerManager::GetListenerManager(nsIEventListenerManager** aInstancePt
return NS_OK;
}
NS_IMETHODIMP
nsEventListenerManager::GetNewListenerManager(nsIEventListenerManager **aInstancePtrResult)
{
return NS_NewEventListenerManager(aInstancePtrResult);
}
NS_IMETHODIMP
nsEventListenerManager::HandleEvent(nsIDOMEvent *aEvent)
{

1
content/events/src/nsEventListenerManager.h
View File

@ -163,7 +163,6 @@ public:
NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener,
const nsIID& aIID);
NS_IMETHOD GetListenerManager(nsIEventListenerManager** aInstancePtrResult);
NS_IMETHOD GetNewListenerManager(nsIEventListenerManager **aInstancePtrResult);
NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent);
protected:

9
content/xul/content/src/nsXULElement.cpp
View File

@ -2023,15 +2023,6 @@ nsXULElement::GetListenerManager(nsIEventListenerManager** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsXULElement::GetNewListenerManager(nsIEventListenerManager **aResult)
{
return nsComponentManager::CreateInstance(kEventListenerManagerCID,
nsnull,
NS_GET_IID(nsIEventListenerManager),
(void**) aResult);
}
NS_IMETHODIMP
nsXULElement::HandleEvent(nsIDOMEvent *aEvent)
{

1
content/xul/content/src/nsXULElement.h
View File

@ -432,7 +432,6 @@ public:
NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID);
NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID);
NS_IMETHOD GetListenerManager(nsIEventListenerManager** aInstancePtrResult);
NS_IMETHOD GetNewListenerManager(nsIEventListenerManager **aInstancePtrResult);
NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent);
// nsIScriptEventHandlerOwner

9
content/xul/document/src/nsXULDocument.cpp
View File

@ -4170,15 +4170,6 @@ nsXULDocument::GetListenerManager(nsIEventListenerManager** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsXULDocument::GetNewListenerManager(nsIEventListenerManager **aResult)
{
return nsComponentManager::CreateInstance(kEventListenerManagerCID,
nsnull,
NS_GET_IID(nsIEventListenerManager),
(void**) aResult);
}
NS_IMETHODIMP
nsXULDocument::HandleEvent(nsIDOMEvent *aEvent)
{

1
content/xul/document/src/nsXULDocument.h
View File

@ -340,7 +340,6 @@ public:
NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID);
NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID);
NS_IMETHOD GetListenerManager(nsIEventListenerManager** aInstancePtrResult);
NS_IMETHOD GetNewListenerManager(nsIEventListenerManager **aInstancePtrResult);
NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent);
// nsIDOMEventTarget interface

9
dom/public/coreEvents/nsIDOMEventReceiver.h
View File

@ -49,10 +49,11 @@ class nsIDOMEventReceiver : public nsIDOMEventTarget {
public:
NS_DEFINE_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(nsIEventListenerManager** aInstancePtrResult) = 0;
NS_IMETHOD GetNewListenerManager(nsIEventListenerManager **aInstancePtrResult) = 0;
NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener,
const nsIID& aIID) = 0;
NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener,
const nsIID& aIID) = 0;
NS_IMETHOD GetListenerManager(nsIEventListenerManager** aResult) = 0;
NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent) = 0;
};

3
dom/src/base/nsDOMClassInfo.cpp
View File

@ -1353,7 +1353,8 @@ StubConstructor(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
// static
nsresult
nsWindowSH::DefineInterfaceProperty(JSContext *cx, JSObject *obj, JSString *str)
nsWindowSH::DefineInterfaceProperty(JSContext *cx, JSObject *obj,
JSString *str)
{
jsval components_val;

20
dom/src/base/nsGlobalWindow.cpp
View File

@ -2606,20 +2606,16 @@ GlobalWindowImpl::RemoveEventListenerByIID(nsIDOMEventListener* aListener,
NS_IMETHODIMP
GlobalWindowImpl::GetListenerManager(nsIEventListenerManager **aResult)
{
if (mListenerManager)
return CallQueryInterface(mListenerManager, aResult);
if (!mListenerManager) {
static NS_DEFINE_CID(kEventListenerManagerCID,
NS_EVENTLISTENERMANAGER_CID);
nsresult rv;
// This is gonna get ugly. Can't use NS_NewEventListenerManager because of
// a circular link problem.
nsCOMPtr<nsIDOMEventReceiver> doc(do_QueryInterface(mDocument));
if (doc) {
if (NS_OK == doc->GetNewListenerManager(aResult)) {
mListenerManager = *aResult;
return NS_OK;
}
mListenerManager = do_CreateInstance(kEventListenerManagerCID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
}
return NS_ERROR_FAILURE;
return CallQueryInterface(mListenerManager, aResult);
}
//XXX I need another way around the circular link problem.

9
dom/src/base/nsWindowRoot.cpp
View File

@ -149,15 +149,6 @@ nsWindowRoot::GetListenerManager(nsIEventListenerManager** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsWindowRoot::GetNewListenerManager(nsIEventListenerManager **aResult)
{
return nsComponentManager::CreateInstance(kEventListenerManagerCID,
nsnull,
NS_GET_IID(nsIEventListenerManager),
(void**) aResult);
}
NS_IMETHODIMP
nsWindowRoot::HandleEvent(nsIDOMEvent *aEvent)
{

1
dom/src/base/nsWindowRoot.h
View File

@ -52,7 +52,6 @@ public:
NS_IMETHOD AddEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID);
NS_IMETHOD RemoveEventListenerByIID(nsIDOMEventListener *aListener, const nsIID& aIID);
NS_IMETHOD GetListenerManager(nsIEventListenerManager** aInstancePtrResult);
NS_IMETHOD GetNewListenerManager(nsIEventListenerManager **aInstancePtrResult);
NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent);
// nsPIWindowRoot