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 1243114 - Convert PromiseCapability::mPromise to a rooted JSObject* instead of a rooted JS::Value. r=bz

Browse Source
This commit is contained in:
Jeff Walden 2016-01-26 23:26:39 -08:00
parent ee66cd2839
commit 15aa119c65
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/promise/Promise.cpp
View File

@ -317,7 +317,7 @@ struct MOZ_STACK_CLASS Promise::PromiseCapability
// purposes it's simpler to store them as JS::Value.
// [[Promise]].
JS::Rooted<JS::Value> mPromise;
JS::Rooted<JSObject*> mPromise;
// [[Resolve]]. Value in the context compartment.
JS::Rooted<JS::Value> mResolve;
// [[Reject]]. Value in the context compartment.
@ -340,7 +340,7 @@ Promise::PromiseCapability::RejectWithException(JSContext* aCx,
// or at least the parts of it that happen if we have an abrupt completion.
MOZ_ASSERT(!aRv.Failed());
MOZ_ASSERT(mNativePromise || !mPromise.isUndefined(),
MOZ_ASSERT(mNativePromise || mPromise,
"NewPromiseCapability didn't succeed");
JS::Rooted<JS::Value> exn(aCx);
@ -370,14 +370,14 @@ Promise::PromiseCapability::RejectWithException(JSContext* aCx,
JS::Value
Promise::PromiseCapability::PromiseValue() const
{
MOZ_ASSERT(mNativePromise || !mPromise.isUndefined(),
MOZ_ASSERT(mNativePromise || mPromise,
"NewPromiseCapability didn't succeed");
if (mNativePromise) {
return JS::ObjectValue(*mNativePromise->GetWrapper());
}
return mPromise;
return JS::ObjectValue(*mPromise);
}
// Promise
@ -965,7 +965,7 @@ Promise::NewPromiseCapability(JSContext* aCx, nsIGlobalObject* aGlobal,
aCapability.mReject = v;
// Step 10.
aCapability.mPromise.setObject(*promiseObj);
aCapability.mPromise = promiseObj;
// Step 11 doesn't need anything, since the PromiseCapability was passed in.
}
@ -1280,11 +1280,11 @@ Promise::Then(JSContext* aCx, JS::Handle<JSObject*> aCalleeGlobal,
RefPtr<AnyCallback> rejectFunc =
new AnyCallback(aCx, rejectObj, GetIncumbentGlobal());
if (!capability.mPromise.isObject()) {
if (!capability.mPromise) {
aRv.ThrowTypeError<MSG_ILLEGAL_PROMISE_CONSTRUCTOR>();
return;
}
JS::Rooted<JSObject*> newPromiseObj(aCx, &capability.mPromise.toObject());
JS::Rooted<JSObject*> newPromiseObj(aCx, capability.mPromise);
// We want to store the reflector itself.
newPromiseObj = js::CheckedUnwrap(newPromiseObj);
if (!newPromiseObj) {