Reviewers: rossberg,
Message:
PTAL
Description:
Fix a few minor issues with promises
We where using the global Promise in a few places where we should
ensure that we use the original Promise function instead.
LOG=N
BUG=None
R=rossberg
Please review this at https://codereview.chromium.org/213053003/
SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+7, -6 lines):
M src/promise.js
Index: src/promise.js
diff --git a/src/promise.js b/src/promise.js
index
9937f0ced70f32d9bb6fc162be8194e9712aa996..dd0681ec9cb09c3728eebfbf25372ba9c08c1414
100644
--- a/src/promise.js
+++ b/src/promise.js
@@ -75,7 +75,8 @@ function PromiseSet(promise, status, value, onResolve,
onReject) {
}
function PromiseInit(promise) {
- return PromiseSet(promise, 0, UNDEFINED, new InternalArray, new
InternalArray)
+ return PromiseSet(
+ promise, 0, UNDEFINED, new InternalArray, new InternalArray);
}
function PromiseDone(promise, status, value, promiseQueue) {
@@ -99,7 +100,7 @@ function PromiseReject(promise, r) {
function PromiseNopResolver() {}
function PromiseCreate() {
- return new Promise(PromiseNopResolver)
+ return new $Promise(PromiseNopResolver)
}
@@ -108,7 +109,7 @@ function PromiseCreate() {
function PromiseDeferred() {
if (this === $Promise) {
// Optimized case, avoid extra closure.
- var promise = PromiseInit(new Promise(promiseRaw));
+ var promise = PromiseInit(new $Promise(promiseRaw));
return {
promise: promise,
resolve: function(x) { PromiseResolve(promise, x) },
@@ -119,7 +120,7 @@ function PromiseDeferred() {
result.promise = new this(function(resolve, reject) {
result.resolve = resolve;
result.reject = reject;
- })
+ });
return result;
}
}
@@ -127,7 +128,7 @@ function PromiseDeferred() {
function PromiseResolved(x) {
if (this === $Promise) {
// Optimized case, avoid extra closure.
- return PromiseSet(new Promise(promiseRaw), +1, x);
+ return PromiseSet(new $Promise(promiseRaw), +1, x);
} else {
return new this(function(resolve, reject) { resolve(x) });
}
@@ -136,7 +137,7 @@ function PromiseResolved(x) {
function PromiseRejected(r) {
if (this === $Promise) {
// Optimized case, avoid extra closure.
- return PromiseSet(new Promise(promiseRaw), -1, r);
+ return PromiseSet(new $Promise(promiseRaw), -1, r);
} else {
return new this(function(resolve, reject) { reject(r) });
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
