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

Backed out changesets 2b47c18653da and b9d17aa000e7 (bug 854614) for Windows bustage on a CLOSED TREE.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-04-05 17:14:51 -04:00
parent d269ef8533
commit 5b8c7c86fb
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/xpconnect/src/XPCQuickStubs.h
View File

@ -392,7 +392,7 @@ castNative(JSContext *cx,
template <class T>
inline JSBool
xpc_qsUnwrapThis(JSContext *cx,
JS::HandleObject obj,
JSObject *obj,
T **ppThis,
nsISupports **pThisRef,
jsval *pThisVal,
@ -401,10 +401,9 @@ xpc_qsUnwrapThis(JSContext *cx,
{
XPCWrappedNative *wrapper;
XPCWrappedNativeTearOff *tearoff;
JS::RootedObject current(cx);
nsresult rv = getWrapper(cx, obj, &wrapper, current.address(), &tearoff);
nsresult rv = getWrapper(cx, obj, &wrapper, &obj, &tearoff);
if (NS_SUCCEEDED(rv))
rv = castNative(cx, wrapper, current, tearoff, NS_GET_TEMPLATE_IID(T),
rv = castNative(cx, wrapper, obj, tearoff, NS_GET_TEMPLATE_IID(T),
reinterpret_cast<void **>(ppThis), pThisRef, pThisVal,
lccx);

2
js/xpconnect/src/nsDOMQS.h
View File

@ -57,7 +57,7 @@ NEW_BINDING(nsDOMEvent, Event);
template <> \
MOZ_ALWAYS_INLINE JSBool \
xpc_qsUnwrapThis<_interface>(JSContext *cx, \
JS::HandleObject obj, \
JSObject *obj, \
_interface **ppThis, \
nsISupports **pThisRef, \
jsval *pThisVal, \

2
js/xpconnect/src/qsgen.py
View File

@ -833,7 +833,7 @@ def writeQuickStub(f, customMethodCalls, stringtable, member, stubName,
f.write(" XPC_QS_ASSERT_CONTEXT_OK(cx);\n")
# Compute "this".
f.write(" JS::RootedObject obj(cx, JS_THIS_OBJECT(cx, vp));\n"
f.write(" JSObject *obj = JS_THIS_OBJECT(cx, vp);\n"
" if (!obj)\n"
" return JS_FALSE;\n")

26
js/xpconnect/src/xpcprivate.h
View File

@ -1309,7 +1309,7 @@ private:
jsid mName;
JSBool mStaticMemberIsLocal;
unsigned mArgc;
unsigned mArgc;
jsval* mArgv;
jsval* mRetVal;
@ -1322,13 +1322,15 @@ public:
XPCLazyCallContext(XPCCallContext& ccx)
: mCallBeginRequest(DONT_CALL_BEGINREQUEST),
mCcx(&ccx),
mCcxToDestroy(nullptr),
mCx(nullptr),
mCallerLanguage(JS_CALLER),
mObj(mCcx->GetJSContext(), nullptr),
mFlattenedJSObject(mCcx->GetJSContext(), nullptr),
mWrapper(nullptr),
mTearOff(nullptr)
mCcxToDestroy(nullptr)
#ifdef DEBUG
, mCx(nullptr)
, mCallerLanguage(JS_CALLER)
, mObj(nullptr)
, mFlattenedJSObject(nullptr)
, mWrapper(nullptr)
, mTearOff(nullptr)
#endif
{
}
XPCLazyCallContext(XPCContext::LangType callerLanguage, JSContext* cx,
@ -1342,8 +1344,8 @@ public:
mCcxToDestroy(nullptr),
mCx(cx),
mCallerLanguage(callerLanguage),
mObj(cx, obj),
mFlattenedJSObject(cx, flattenedJSObject),
mObj(obj),
mFlattenedJSObject(flattenedJSObject),
mWrapper(wrapper),
mTearOff(tearoff)
{
@ -1435,8 +1437,8 @@ private:
XPCCallContext *mCcxToDestroy;
JSContext *mCx;
XPCContext::LangType mCallerLanguage;
JS::RootedObject mObj;
JS::RootedObject mFlattenedJSObject;
JSObject *mObj;
JSObject *mFlattenedJSObject;
XPCWrappedNative *mWrapper;
XPCWrappedNativeTearOff *mTearOff;
mozilla::AlignedStorage2<XPCCallContext> mData;