OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 13 matching lines...) Expand all Loading... |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "core/dom/Microtask.h" | 31 #include "core/dom/Microtask.h" |
32 | 32 |
33 #include "bindings/core/v8/V8PerIsolateData.h" | 33 #include "bindings/core/v8/V8PerIsolateData.h" |
| 34 #include "bindings/core/v8/V8RecursionScope.h" |
34 #include "platform/ScriptForbiddenScope.h" | 35 #include "platform/ScriptForbiddenScope.h" |
35 #include "platform/Task.h" | 36 #include "platform/Task.h" |
36 #include "public/platform/WebTaskRunner.h" | 37 #include "public/platform/WebTaskRunner.h" |
37 #include <v8.h> | 38 #include <v8.h> |
38 | 39 |
39 namespace blink { | 40 namespace blink { |
40 | 41 |
41 void Microtask::performCheckpoint(v8::Isolate* isolate) | 42 void Microtask::performCheckpoint(v8::Isolate* isolate) |
42 { | 43 { |
43 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); | 44 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); |
44 ASSERT(isolateData); | 45 ASSERT(isolateData); |
45 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo
int() || isolateData->destructionPending() || ScriptForbiddenScope::isScriptForb
idden()) | 46 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo
int() || isolateData->destructionPending() || ScriptForbiddenScope::isScriptForb
idden()) |
46 return; | 47 return; |
47 isolateData->setPerformingMicrotaskCheckpoint(true); | 48 isolateData->setPerformingMicrotaskCheckpoint(true); |
48 isolate->RunMicrotasks(); | 49 { |
| 50 // Ensure that end-of-task-or-microtask actions are performed. |
| 51 V8RecursionScope recursionScope(isolate); |
| 52 isolate->RunMicrotasks(); |
| 53 } |
49 isolateData->setPerformingMicrotaskCheckpoint(false); | 54 isolateData->setPerformingMicrotaskCheckpoint(false); |
50 } | 55 } |
51 | 56 |
| 57 bool Microtask::performingCheckpoint(v8::Isolate* isolate) |
| 58 { |
| 59 return V8PerIsolateData::from(isolate)->performingMicrotaskCheckpoint(); |
| 60 } |
| 61 |
52 static void microtaskFunctionCallback(void* data) | 62 static void microtaskFunctionCallback(void* data) |
53 { | 63 { |
54 OwnPtr<WebTaskRunner::Task> task = adoptPtr(static_cast<WebTaskRunner::Task*
>(data)); | 64 OwnPtr<WebTaskRunner::Task> task = adoptPtr(static_cast<WebTaskRunner::Task*
>(data)); |
55 task->run(); | 65 task->run(); |
56 } | 66 } |
57 | 67 |
58 void Microtask::enqueueMicrotask(PassOwnPtr<WebTaskRunner::Task> callback) | 68 void Microtask::enqueueMicrotask(PassOwnPtr<WebTaskRunner::Task> callback) |
59 { | 69 { |
60 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 70 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
61 isolate->EnqueueMicrotask(µtaskFunctionCallback, callback.leakPtr()); | 71 isolate->EnqueueMicrotask(µtaskFunctionCallback, callback.leakPtr()); |
62 } | 72 } |
63 | 73 |
64 void Microtask::enqueueMicrotask(PassOwnPtr<Closure> callback) | 74 void Microtask::enqueueMicrotask(PassOwnPtr<Closure> callback) |
65 { | 75 { |
66 enqueueMicrotask(adoptPtr(new Task(callback))); | 76 enqueueMicrotask(adoptPtr(new Task(callback))); |
67 } | 77 } |
68 | 78 |
69 } // namespace blink | 79 } // namespace blink |
OLD | NEW |