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

Bug 696663 - Make nsIJSEventListener::mScopeObject a JSObject; r=smaug

Browse Source
This commit is contained in:
Ms2ger 2011-10-29 22:17:43 +02:00
parent b6e4d8c64c
commit ff22313bf8
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,7 +392,7 @@ nsEventListenerManager::FindJSEventListener(PRUint32 aEventType,
nsresult
nsEventListenerManager::SetJSEventListener(nsIScriptContext *aContext,
void *aScopeObject,
JSObject* aScopeObject,
nsIAtom* aName,
JSObject *aHandler,
bool aPermitUntrustedEvents,

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

@ -264,7 +264,7 @@ protected:
* any, is returned in aListenerStruct.
*/
nsresult SetJSEventListener(nsIScriptContext *aContext,
void *aScopeGlobal,
JSObject* aScopeGlobal,
nsIAtom* aName,
JSObject *aHandler,
bool aPermitUntrustedEvents,

12
dom/base/nsIJSEventListener.h
View File

@ -46,8 +46,8 @@ class nsIScriptObjectOwner;
class nsIAtom;
#define NS_IJSEVENTLISTENER_IID \
{ 0x2135cf56, 0x5954, 0x40fa, \
{ 0x80, 0xb8, 0xd7, 0xd8, 0xa9, 0x22, 0xa2, 0x8a } }
{ 0xafc5d047, 0xdb6b, 0x4076, \
{ 0xb3, 0xfa, 0x57, 0x96, 0x1e, 0x21, 0x48, 0x42 } }
// Implemented by script event listeners. Used to retrieve the
// script object corresponding to the event target and the handler itself.
@ -58,7 +58,7 @@ class nsIJSEventListener : public nsIDOMEventListener
public:
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IJSEVENTLISTENER_IID)
nsIJSEventListener(nsIScriptContext *aContext, void *aScopeObject,
nsIJSEventListener(nsIScriptContext* aContext, JSObject* aScopeObject,
nsISupports *aTarget, JSObject *aHandler)
: mContext(aContext), mScopeObject(aScopeObject),
mTarget(do_QueryInterface(aTarget)), mHandler(aHandler)
@ -75,7 +75,7 @@ public:
return mTarget;
}
void *GetEventScope() const
JSObject* GetEventScope() const
{
return mScopeObject;
}
@ -96,7 +96,7 @@ protected:
{
}
nsCOMPtr<nsIScriptContext> mContext;
void *mScopeObject;
JSObject* mScopeObject;
nsCOMPtr<nsISupports> mTarget;
JSObject *mHandler;
};
@ -105,7 +105,7 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIJSEventListener, NS_IJSEVENTLISTENER_IID)
/* factory function. aHandler must already be bound to aTarget */
nsresult NS_NewJSEventListener(nsIScriptContext *aContext,
void *aScopeObject, nsISupports *aTarget,
JSObject* aScopeObject, nsISupports* aTarget,
nsIAtom* aType, JSObject* aHandler,
nsIDOMEventListener **aReturn);

4
dom/src/events/nsJSEventListener.cpp
View File

@ -73,7 +73,7 @@ static EventListenerCounter sEventListenerCounter;
* nsJSEventListener implementation
*/
nsJSEventListener::nsJSEventListener(nsIScriptContext *aContext,
void *aScopeObject,
JSObject* aScopeObject,
nsISupports *aTarget,
nsIAtom* aType,
JSObject *aHandler)
@ -272,7 +272,7 @@ nsJSEventListener::SetHandler(JSObject *aHandler)
*/
nsresult
NS_NewJSEventListener(nsIScriptContext *aContext, void *aScopeObject,
NS_NewJSEventListener(nsIScriptContext* aContext, JSObject* aScopeObject,
nsISupports*aTarget, nsIAtom* aEventType,
JSObject* aHandler, nsIDOMEventListener ** aReturn)
{

2
dom/src/events/nsJSEventListener.h
View File

@ -52,7 +52,7 @@
class nsJSEventListener : public nsIJSEventListener
{
public:
nsJSEventListener(nsIScriptContext *aContext, void *aScopeObject,
nsJSEventListener(nsIScriptContext* aContext, JSObject* aScopeObject,
nsISupports* aTarget, nsIAtom* aType, JSObject* aHandler);
virtual ~nsJSEventListener();