Bug 755255 - Remove mThreadData from XPCCallContext. r=mrbkap

js/xpconnect/src/XPCCallContext.cpp

@@ -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)

js/xpconnect/src/XPCInlines.h

@@ -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
 {

js/xpconnect/src/xpcprivate.h

@@ -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;