зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1281276 part 4. Get rid of XPCContext's mCallingLangType member. r=bholley
This commit is contained in:
Родитель
069e9491af
Коммит
eea77304b5
|
@ -40,7 +40,6 @@ XPCCallContext::XPCCallContext(XPCContext::LangType callerLanguage,
|
|||
return;
|
||||
|
||||
mXPCContext = XPCContext::GetXPCContext(mJSContext);
|
||||
mPrevCallerLanguage = mXPCContext->SetCallingLangType(callerLanguage);
|
||||
|
||||
// hook into call context chain.
|
||||
mPrevCallContext = XPCJSRuntime::Get()->SetCallContext(this);
|
||||
|
@ -207,8 +206,6 @@ XPCCallContext::SystemIsBeingShutDown()
|
|||
XPCCallContext::~XPCCallContext()
|
||||
{
|
||||
if (mXPCContext) {
|
||||
mXPCContext->SetCallingLangType(mPrevCallerLanguage);
|
||||
|
||||
DebugOnly<XPCCallContext*> old = XPCJSRuntime::Get()->SetCallContext(mPrevCallContext);
|
||||
MOZ_ASSERT(old == this, "bad pop from per thread data");
|
||||
}
|
||||
|
|
|
@ -17,8 +17,7 @@ XPCContext::XPCContext(XPCJSRuntime* aRuntime,
|
|||
: mRuntime(aRuntime),
|
||||
mJSContext(aJSContext),
|
||||
mLastResult(NS_OK),
|
||||
mPendingResult(NS_OK),
|
||||
mCallingLangType(LANG_UNKNOWN)
|
||||
mPendingResult(NS_OK)
|
||||
{
|
||||
MOZ_COUNT_CTOR(XPCContext);
|
||||
|
||||
|
@ -49,10 +48,6 @@ XPCContext::DebugDump(int16_t depth)
|
|||
// XXX show the exception here...
|
||||
}
|
||||
|
||||
XPC_LOG_ALWAYS(("mCallingLangType of %s",
|
||||
mCallingLangType == LANG_UNKNOWN ? "LANG_UNKNOWN" :
|
||||
mCallingLangType == LANG_JS ? "LANG_JS" :
|
||||
"LANG_NATIVE"));
|
||||
XPC_LOG_OUTDENT();
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -673,16 +673,6 @@ public:
|
|||
|
||||
enum LangType {LANG_UNKNOWN, LANG_JS, LANG_NATIVE};
|
||||
|
||||
LangType GetCallingLangType() const
|
||||
{
|
||||
return mCallingLangType;
|
||||
}
|
||||
LangType SetCallingLangType(LangType lt)
|
||||
{
|
||||
LangType tmp = mCallingLangType;
|
||||
mCallingLangType = lt;
|
||||
return tmp;
|
||||
}
|
||||
nsresult GetException(nsIException** e)
|
||||
{
|
||||
nsCOMPtr<nsIException> rval = mException;
|
||||
|
@ -716,7 +706,6 @@ private:
|
|||
nsresult mLastResult;
|
||||
nsresult mPendingResult;
|
||||
nsCOMPtr<nsIException> mException;
|
||||
LangType mCallingLangType;
|
||||
bool mErrorUnreported;
|
||||
};
|
||||
|
||||
|
@ -852,8 +841,6 @@ private:
|
|||
|
||||
// ctor does not necessarily init the following. BEWARE!
|
||||
|
||||
XPCContext::LangType mPrevCallerLanguage;
|
||||
|
||||
XPCCallContext* mPrevCallContext;
|
||||
|
||||
XPCWrappedNative* mWrapper;
|
||||
|
|
Загрузка…
Ссылка в новой задаче