corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 977287, part 1 - Rename the "operation callback" to "interrupt callback". r=luke.

Browse Source
This commit is contained in:
Jason Orendorff
2014-03-10 16:28:43 -05:00
parent b6a178d8d9
commit 4fe7f16272
43 changed files with 338 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsiter.cpp
View File

@@ -934,8 +934,8 @@ js::ValueToIterator(JSContext *cx, unsigned flags, MutableHandleValue vp)
JS_ASSERT_IF(flags & JSITER_KEYVALUE, flags & JSITER_FOREACH);
/*
* Make sure the more/next state machine doesn't get stuck. A value might be
* left in iterValue when a trace is left due to an operation time-out after
* Make sure the more/next state machine doesn't get stuck. A value might
* be left in iterValue when a trace is left due to an interrupt after
* JSOP_MOREITER but before the value is picked up by FOR*.
*/
cx->iterValue.setMagic(JS_NO_ITER_VALUE);
@@ -1351,7 +1351,7 @@ ForOfIterator::nextFromOptimizedArray(MutableHandleValue vp, bool *done)
{
JS_ASSERT(index != NOT_ARRAY);
if (!JS_CHECK_OPERATION_LIMIT(cx_))
if (!CheckForInterrupt(cx_))
return false;
JS_ASSERT(iterator->isNative());