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 854614 - Root XPCLazyCallContext. r=terrence,bholley

Browse Source
This commit is contained in:
Tom Schuster 2013-04-05 21:59:06 +02:00
parent 9b2d903aae
commit b93dfd732b
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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