diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/v8/src/execution.cc | |
parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/v8/src/execution.cc')
-rw-r--r-- | chromium/v8/src/execution.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/chromium/v8/src/execution.cc b/chromium/v8/src/execution.cc index 979641a9de5..c0e9a64fbb0 100644 --- a/chromium/v8/src/execution.cc +++ b/chromium/v8/src/execution.cc @@ -354,6 +354,20 @@ Handle<Object> Execution::TryGetConstructorDelegate( } +void Execution::RunMicrotasks(Isolate* isolate) { + ASSERT(isolate->microtask_pending()); + bool threw = false; + Execution::Call( + isolate, + isolate->run_microtasks(), + isolate->factory()->undefined_value(), + 0, + NULL, + &threw); + ASSERT(!threw); +} + + bool StackGuard::IsStackOverflow() { ExecutionAccess access(isolate_); return (thread_local_.jslimit_ != kInterruptLimit && @@ -814,8 +828,6 @@ static Object* RuntimePreempt(Isolate* isolate) { // Clear the preempt request flag. isolate->stack_guard()->Continue(PREEMPT); - ContextSwitcher::PreemptionReceived(); - #ifdef ENABLE_DEBUGGER_SUPPORT if (isolate->debug()->InDebugger()) { // If currently in the debugger don't do any actual preemption but record @@ -951,7 +963,7 @@ MaybeObject* Execution::HandleStackGuardInterrupt(Isolate* isolate) { Deoptimizer::DeoptimizeAll(isolate); } if (stack_guard->IsInstallCodeRequest()) { - ASSERT(FLAG_concurrent_recompilation); + ASSERT(isolate->concurrent_recompilation_enabled()); stack_guard->Continue(INSTALL_CODE); isolate->optimizing_compiler_thread()->InstallOptimizedFunctions(); } |