wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 696668 - Give nsIScriptContext::CallEventHandler a JSObject scope parameter; r=mrbkap

Browse Source
This commit is contained in:
Ms2ger 2011-10-29 22:19:03 +02:00
parent 94dc2deff1
commit 59007b3a67
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/base/nsIScriptContext.h
View File

@ -74,8 +74,8 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIScriptContextPrincipal,
NS_ISCRIPTCONTEXTPRINCIPAL_IID) NS_ISCRIPTCONTEXTPRINCIPAL_IID)
#define NS_ISCRIPTCONTEXT_IID \ #define NS_ISCRIPTCONTEXT_IID \
{ 0x530d739f, 0x6d79, 0x4919, \ { 0x2e583bf4, 0x3c1f, 0x432d, \
{ 0x82, 0xb0, 0xef, 0xeb, 0x75, 0xf8, 0xa6, 0x3f } } { 0x82, 0x83, 0x8d, 0xee, 0x7e, 0xcc, 0xc8, 0x8b } }
/* This MUST match JSVERSION_DEFAULT. This version stuff if we don't /* This MUST match JSVERSION_DEFAULT. This version stuff if we don't
know what language we have is a little silly... */ know what language we have is a little silly... */
@ -226,7 +226,7 @@ public:
* @param rval out parameter returning result * @param rval out parameter returning result
**/ **/
virtual nsresult CallEventHandler(nsISupports* aTarget, virtual nsresult CallEventHandler(nsISupports* aTarget,
void *aScope, void* aHandler, JSObject* aScope, void* aHandler,
nsIArray *argv, nsIVariant **rval) = 0; nsIArray *argv, nsIVariant **rval) = 0;
/** /**

7
dom/base/nsJSEnvironment.cpp
View File

@ -1852,8 +1852,8 @@ nsJSContext::CompileFunction(void* aTarget,
} }
nsresult nsresult
nsJSContext::CallEventHandler(nsISupports* aTarget, void *aScope, void *aHandler, nsJSContext::CallEventHandler(nsISupports* aTarget, JSObject* aScope,
nsIArray *aargv, nsIVariant **arv) void *aHandler, nsIArray *aargv, nsIVariant **arv)
{ {
NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED); NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);
@ -1875,8 +1875,7 @@ nsJSContext::CallEventHandler(nsISupports* aTarget, void *aScope, void *aHandler
JSAutoRequest ar(mContext); JSAutoRequest ar(mContext);
JSObject* target = nsnull; JSObject* target = nsnull;
nsresult rv = JSObjectFromInterface(aTarget, static_cast<JSObject*>(aScope), nsresult rv = JSObjectFromInterface(aTarget, aScope, &target);
&target);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
js::AutoObjectRooter targetVal(mContext, target); js::AutoObjectRooter targetVal(mContext, target);

2
dom/base/nsJSEnvironment.h
View File

@ -109,7 +109,7 @@ public:
const char *aURL, PRUint32 aLineNo, const char *aURL, PRUint32 aLineNo,
PRUint32 aVersion, PRUint32 aVersion,
nsScriptObjectHolder &aHandler); nsScriptObjectHolder &aHandler);
virtual nsresult CallEventHandler(nsISupports* aTarget, void *aScope, virtual nsresult CallEventHandler(nsISupports* aTarget, JSObject* aScope,
void* aHandler, void* aHandler,
nsIArray *argv, nsIVariant **rv); nsIArray *argv, nsIVariant **rv);
virtual nsresult BindCompiledEventHandler(nsISupports *aTarget, virtual nsresult BindCompiledEventHandler(nsISupports *aTarget,