Index: third_party/WebKit/Source/core/dom/Microtask.cpp |
diff --git a/third_party/WebKit/Source/core/dom/Microtask.cpp b/third_party/WebKit/Source/core/dom/Microtask.cpp |
index 9e57c775ad0d3a1f20d42164bbafdde3fdfb7777..488c577f79f8dac4d4c285c74b6d0889169aa8b3 100644 |
--- a/third_party/WebKit/Source/core/dom/Microtask.cpp |
+++ b/third_party/WebKit/Source/core/dom/Microtask.cpp |
@@ -40,9 +40,13 @@ |
void Microtask::performCheckpoint(v8::Isolate* isolate) |
{ |
- if (ScriptForbiddenScope::isScriptForbidden()) |
+ V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); |
+ ASSERT(isolateData); |
+ if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpoint() || isolateData->destructionPending() || ScriptForbiddenScope::isScriptForbidden()) |
return; |
- v8::MicrotasksScope::PerformCheckpoint(isolate); |
+ isolateData->setPerformingMicrotaskCheckpoint(true); |
+ isolate->RunMicrotasks(); |
+ isolateData->setPerformingMicrotaskCheckpoint(false); |
} |
static void microtaskFunctionCallback(void* data) |