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 755255 - Remove mThreadData from XPCCallContext. r=mrbkap

Browse Source
This commit is contained in:
Bobby Holley 2012-06-21 16:14:49 +02:00
parent 6e85f24e95
commit dbfd454b32
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/xpconnect/src/XPCCallContext.cpp
View File

@ -22,7 +22,6 @@ XPCCallContext::XPCCallContext(XPCContext::LangType callerLanguage,
jsval *rval /* = nsnull */)
: mState(INIT_FAILED),
mXPC(nsXPConnect::GetXPConnect()),
mThreadData(nsnull),
mXPCContext(nsnull),
mJSContext(cx),
mContextPopRequired(false),
@ -42,7 +41,6 @@ XPCCallContext::XPCCallContext(XPCContext::LangType callerLanguage,
XPCWrappedNativeTearOff* tearOff)
: mState(INIT_FAILED),
mXPC(nsXPConnect::GetXPConnect()),
mThreadData(nsnull),
mXPCContext(nsnull),
mJSContext(cx),
mContextPopRequired(false),
@ -71,11 +69,6 @@ XPCCallContext::Init(XPCContext::LangType callerLanguage,
if (!mXPC)
return;
mThreadData = XPCPerThreadData::GetData(mJSContext);
if (!mThreadData)
return;
XPCJSContextStack* stack = XPCJSRuntime::Get()->GetJSContextStack();
if (!stack) {
@ -283,7 +276,6 @@ XPCCallContext::SystemIsBeingShutDown()
// can be making this call on one thread for call contexts on another
// thread.
NS_WARNING("Shutting Down XPConnect even through there is a live XPCCallContext");
mThreadData = nsnull;
mXPCContext = nsnull;
mState = SYSTEM_SHUTDOWN;
if (mPrevCallContext)

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

@ -54,13 +54,6 @@ XPCCallContext::GetRuntime() const
return mXPCContext->GetRuntime();
}
inline XPCPerThreadData*
XPCCallContext::GetThreadData() const
{
CHECK_STATE(HAVE_CONTEXT);
return mThreadData;
}
inline XPCContext*
XPCCallContext::GetXPCContext() const
{

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

@ -1108,7 +1108,6 @@ public:
inline nsXPConnect* GetXPConnect() const ;
inline XPCJSRuntime* GetRuntime() const ;
inline XPCPerThreadData* GetThreadData() const ;
inline XPCContext* GetXPCContext() const ;
inline JSContext* GetJSContext() const ;
inline JSBool GetContextPopRequired() const ;
@ -1231,7 +1230,6 @@ private:
nsXPConnect* mXPC;
XPCPerThreadData* mThreadData;
XPCContext* mXPCContext;
JSContext* mJSContext;
JSBool mContextPopRequired;