Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 21:22:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 883450 - Miscellaneous requests. r=gabor

Browse Source
This commit is contained in:
Bobby Holley 2013-06-20 11:05:34 -07:00
parent 44080291f9
commit 3b1eda0cea
9 changed files with 11 additions and 4 deletions

2
content/base/src/nsFrameMessageManager.cpp

@ -620,8 +620,8 @@ nsFrameMessageManager::ReceiveMessage(nsISupports* aTarget,
JSContext *cxToUse = mContext ? mContext
: (aContext ? aContext
: nsContentUtils::GetSafeJSContext());
JS::Rooted<JSObject*> objectsArray(cxToUse, aObjectsArray);
AutoPushJSContext ctx(cxToUse);
JS::Rooted<JSObject*> objectsArray(cxToUse, aObjectsArray);
if (mListeners.Length()) {
nsCOMPtr<nsIAtom> name = do_GetAtom(aMessage);
MMListenerRemover lr(this);

1
content/events/src/nsEventListenerManager.cpp

@ -731,6 +731,7 @@ nsEventListenerManager::SetEventHandler(nsIAtom *aName,
nsIScriptContext* context = global->GetScriptContext();
NS_ENSURE_TRUE(context, NS_ERROR_FAILURE);
JSAutoRequest ar(context->GetNativeContext());
JS::Rooted<JSObject*> scope(context->GetNativeContext(),
global->GetGlobalJSObject());

1
content/xbl/src/nsXBLProtoImpl.cpp

@ -68,6 +68,7 @@ nsXBLProtoImpl::InstallImplementation(nsXBLPrototypeBinding* aPrototypeBinding,
// This function also has the side effect of building up the prototype implementation if it has
// not been built already.
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
JSAutoRequest ar(context->GetNativeContext());
JS::Rooted<JSObject*> targetClassObject(context->GetNativeContext(), nullptr);
bool targetObjectIsNew = false;
nsresult rv = InitTargetObjects(aPrototypeBinding, context,

2
content/xul/content/src/nsXULElement.cpp

@ -2456,6 +2456,7 @@ nsXULPrototypeScript::Deserialize(nsIObjectInputStream* aStream,
nsIScriptContext *context = aGlobal->GetScriptContext();
NS_ASSERTION(context != nullptr, "Have no context for deserialization");
NS_ENSURE_TRUE(context, NS_ERROR_UNEXPECTED);
JSAutoRequest ar(context->GetNativeContext());
JS::Rooted<JSScript*> newScriptObject(context->GetNativeContext());
rv = context->Deserialize(aStream, &newScriptObject);
if (NS_FAILED(rv)) {
@ -2571,6 +2572,7 @@ nsXULPrototypeScript::Compile(const PRUnichar* aText,
// Ok, compile it to create a prototype script object!
JSAutoRequest ar(context->GetNativeContext());
JS::Rooted<JSScript*> newScriptObject(context->GetNativeContext());
// If the script was inline, tell the JS parser to save source for

1
dom/base/nsJSEnvironment.cpp

@ -1364,6 +1364,7 @@ nsresult
nsJSContext::ExecuteScript(JSScript* aScriptObject_,
JSObject* aScopeObject_)
{
JSAutoRequest ar(mContext);
JS::Rooted<JSObject*> aScopeObject(mContext, aScopeObject_);
JS::Rooted<JSScript*> aScriptObject(mContext, aScriptObject_);
NS_ENSURE_TRUE(mIsInitialized, NS_ERROR_NOT_INITIALIZED);

4
dom/future/Future.cpp

@ -252,8 +252,8 @@ Future::RunTask()
mResolveCallbacks.Clear();
mRejectCallbacks.Clear();
Optional<JS::Handle<JS::Value> > value(nsContentUtils::GetSafeJSContext(),
mResult);
JSAutoRequest ar(nsContentUtils::GetSafeJSContext());
Optional<JS::Handle<JS::Value> > value(nsContentUtils::GetSafeJSContext(), mResult);
for (uint32_t i = 0; i < callbacks.Length(); ++i) {
callbacks[i]->Call(value);

2
dom/plugins/base/nsJSNPRuntime.cpp

@ -601,11 +601,11 @@ doInvoke(NPObject *npobj, NPIdentifier method, const NPVariant *args,
VOID_TO_NPVARIANT(*result);
nsJSObjWrapper *npjsobj = (nsJSObjWrapper *)npobj;
JS::Rooted<JS::Value> fv(cx);
nsCxPusher pusher;
pusher.Push(cx);
JSAutoCompartment ac(cx, npjsobj->mJSObj);
JS::Rooted<JS::Value> fv(cx);
AutoJSExceptionReporter reporter(cx);

1
js/xpconnect/loader/mozJSComponentLoader.cpp

@ -517,6 +517,7 @@ mozJSComponentLoader::LoadModule(FileLocation &aFile)
nsAutoPtr<ModuleEntry> entry(new ModuleEntry);
JSAutoRequest ar(mContext);
RootedValue dummy(mContext);
rv = ObjectForLocation(file, uri, &entry->obj,
&entry->location, false, &dummy);

1
xpcom/base/CycleCollectedJSRuntime.cpp

@ -922,6 +922,7 @@ CycleCollectedJSRuntime::UsefulToMergeZones() const
{
JSContext* iter = nullptr;
JSContext* cx;
JSAutoRequest ar(nsContentUtils::GetSafeJSContext());
while ((cx = JS_ContextIterator(mJSRuntime, &iter))) {
// Skip anything without an nsIScriptContext, as well as any scx whose
// NativeGlobal() is not an outer window (this happens with XUL Prototype