Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1120501 P1 Make it easier to use Promise::All() from C++ code. r=nsm

Browse Source
This commit is contained in:
Ben Kelly 2015-04-29 08:59:43 -07:00
parent c73d24b44c
commit f062a9c6ca
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dom/promise/Promise.cpp
View File

@ -955,6 +955,26 @@ NS_IMPL_CYCLE_COLLECTION(AllResolveHandler, mCountdownHolder)
/* static */ already_AddRefed<Promise>
Promise::All(const GlobalObject& aGlobal,
const Sequence<JS::Value>& aIterable, ErrorResult& aRv)
{
JSContext* cx = aGlobal.Context();
nsTArray<nsRefPtr<Promise>> promiseList;
for (uint32_t i = 0; i < aIterable.Length(); ++i) {
JS::Rooted<JS::Value> value(cx, aIterable.ElementAt(i));
nsRefPtr<Promise> nextPromise = Promise::Resolve(aGlobal, value, aRv);
MOZ_ASSERT(!aRv.Failed());
promiseList.AppendElement(Move(nextPromise));
}
return Promise::All(aGlobal, promiseList, aRv);
}
/* static */ already_AddRefed<Promise>
Promise::All(const GlobalObject& aGlobal,
const nsTArray<nsRefPtr<Promise>>& aPromiseList, ErrorResult& aRv)
{
nsCOMPtr<nsIGlobalObject> global =
do_QueryInterface(aGlobal.GetAsSupports());
@ -965,7 +985,7 @@ Promise::All(const GlobalObject& aGlobal,
JSContext* cx = aGlobal.Context();
if (aIterable.Length() == 0) {
if (aPromiseList.IsEmpty()) {
JS::Rooted<JSObject*> empty(cx, JS_NewArrayObject(cx, 0));
if (!empty) {
aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
@ -982,7 +1002,7 @@ Promise::All(const GlobalObject& aGlobal,
return nullptr;
}
nsRefPtr<CountdownHolder> holder =
new CountdownHolder(aGlobal, promise, aIterable.Length());
new CountdownHolder(aGlobal, promise, aPromiseList.Length());
JS::Rooted<JSObject*> obj(cx, JS::CurrentGlobalOrNull(cx));
if (!obj) {
@ -992,20 +1012,16 @@ Promise::All(const GlobalObject& aGlobal,
nsRefPtr<PromiseCallback> rejectCb = new RejectPromiseCallback(promise, obj);
for (uint32_t i = 0; i < aIterable.Length(); ++i) {
JS::Rooted<JS::Value> value(cx, aIterable.ElementAt(i));
nsRefPtr<Promise> nextPromise = Promise::Resolve(aGlobal, value, aRv);
MOZ_ASSERT(!aRv.Failed());
for (uint32_t i = 0; i < aPromiseList.Length(); ++i) {
nsRefPtr<PromiseNativeHandler> resolveHandler =
new AllResolveHandler(holder, i);
nsRefPtr<PromiseCallback> resolveCb =
new NativePromiseCallback(resolveHandler, Resolved);
// Every promise gets its own resolve callback, which will set the right
// index in the array to the resolution value.
nextPromise->AppendCallbacks(resolveCb, rejectCb);
aPromiseList[i]->AppendCallbacks(resolveCb, rejectCb);
}
return promise.forget();

4
dom/promise/Promise.h
View File

@ -187,6 +187,10 @@ public:
All(const GlobalObject& aGlobal,
const Sequence<JS::Value>& aIterable, ErrorResult& aRv);
static already_AddRefed<Promise>
All(const GlobalObject& aGlobal,
const nsTArray<nsRefPtr<Promise>>& aPromiseList, ErrorResult& aRv);
static already_AddRefed<Promise>
Race(const GlobalObject& aGlobal,
const Sequence<JS::Value>& aIterable, ErrorResult& aRv);