Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Side by Side Diff: src/promise.js

Issue 251813004: Revert "PromiseThen should ignore non-function parameters." (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | test/mjsunit/es6/promises.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 } 208 }
209 if (uncaught) %DebugPendingExceptionInPromise(exception, deferred.promise); 209 if (uncaught) %DebugPendingExceptionInPromise(exception, deferred.promise);
210 } 210 }
211 } 211 }
212 212
213 213
214 // Multi-unwrapped chaining with thenable coercion. 214 // Multi-unwrapped chaining with thenable coercion.
215 215
216 function PromiseThen(onResolve, onReject) { 216 function PromiseThen(onResolve, onReject) {
217 onResolve = 217 onResolve =
218 IS_SPEC_FUNCTION(onResolve) ? onResolve : PromiseIdResolveHandler; 218 IS_NULL_OR_UNDEFINED(onResolve) ? PromiseIdResolveHandler : onResolve;
219 onReject = 219 onReject =
220 IS_SPEC_FUNCTION(onReject) ? onReject : PromiseIdRejectHandler; 220 IS_NULL_OR_UNDEFINED(onReject) ? PromiseIdRejectHandler : onReject;
221 var that = this; 221 var that = this;
222 var constructor = this.constructor; 222 var constructor = this.constructor;
223 return %_CallFunction( 223 return %_CallFunction(
224 this, 224 this,
225 function(x) { 225 function(x) {
226 x = PromiseCoerce(constructor, x); 226 x = PromiseCoerce(constructor, x);
227 return x === that ? onReject(MakeTypeError('promise_cyclic', [x])) : 227 return x === that ? onReject(MakeTypeError('promise_cyclic', [x])) :
228 IsPromise(x) ? x.then(onResolve, onReject) : onResolve(x); 228 IsPromise(x) ? x.then(onResolve, onReject) : onResolve(x);
229 }, 229 },
230 onReject, 230 onReject,
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 return GET_PRIVATE(promise, promiseOnResolve); 348 return GET_PRIVATE(promise, promiseOnResolve);
349 } 349 }
350 350
351 function GetPromiseOnReject(promise) { 351 function GetPromiseOnReject(promise) {
352 return GET_PRIVATE(promise, promiseOnReject); 352 return GET_PRIVATE(promise, promiseOnReject);
353 } 353 }
354 354
355 function GetPromiseValue(promise) { 355 function GetPromiseValue(promise) {
356 return GET_PRIVATE(promise, promiseValue); 356 return GET_PRIVATE(promise, promiseValue);
357 } 357 }
OLDNEW
« no previous file with comments | « no previous file | test/mjsunit/es6/promises.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698