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 17 matching lines...) Expand all Loading... |
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 "config.h" | 31 #include "config.h" |
32 #include "core/dom/Microtask.h" | 32 #include "core/dom/Microtask.h" |
33 | 33 |
34 #include "bindings/core/v8/V8PerIsolateData.h" | 34 #include "bindings/core/v8/V8PerIsolateData.h" |
35 #include "bindings/core/v8/V8RecursionScope.h" | 35 #include "bindings/core/v8/V8RecursionScope.h" |
36 #include "platform/ScriptForbiddenScope.h" | 36 #include "platform/ScriptForbiddenScope.h" |
37 #include "platform/Task.h" | 37 #include "platform/Task.h" |
38 #include "public/platform/WebThread.h" | 38 #include "public/platform/WebTaskRunner.h" |
39 #include <v8.h> | 39 #include <v8.h> |
40 | 40 |
41 namespace blink { | 41 namespace blink { |
42 | 42 |
43 void Microtask::performCheckpoint(v8::Isolate* isolate) | 43 void Microtask::performCheckpoint(v8::Isolate* isolate) |
44 { | 44 { |
45 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); | 45 V8PerIsolateData* isolateData = V8PerIsolateData::from(isolate); |
46 ASSERT(isolateData); | 46 ASSERT(isolateData); |
47 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo
int() || isolateData->destructionPending() || ScriptForbiddenScope::isScriptForb
idden()) | 47 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo
int() || isolateData->destructionPending() || ScriptForbiddenScope::isScriptForb
idden()) |
48 return; | 48 return; |
49 isolateData->setPerformingMicrotaskCheckpoint(true); | 49 isolateData->setPerformingMicrotaskCheckpoint(true); |
50 { | 50 { |
51 // Ensure that end-of-task-or-microtask actions are performed. | 51 // Ensure that end-of-task-or-microtask actions are performed. |
52 V8RecursionScope recursionScope(isolate); | 52 V8RecursionScope recursionScope(isolate); |
53 isolate->RunMicrotasks(); | 53 isolate->RunMicrotasks(); |
54 } | 54 } |
55 isolateData->setPerformingMicrotaskCheckpoint(false); | 55 isolateData->setPerformingMicrotaskCheckpoint(false); |
56 } | 56 } |
57 | 57 |
58 bool Microtask::performingCheckpoint(v8::Isolate* isolate) | 58 bool Microtask::performingCheckpoint(v8::Isolate* isolate) |
59 { | 59 { |
60 return V8PerIsolateData::from(isolate)->performingMicrotaskCheckpoint(); | 60 return V8PerIsolateData::from(isolate)->performingMicrotaskCheckpoint(); |
61 } | 61 } |
62 | 62 |
63 static void microtaskFunctionCallback(void* data) | 63 static void microtaskFunctionCallback(void* data) |
64 { | 64 { |
65 OwnPtr<WebThread::Task> task = adoptPtr(static_cast<WebThread::Task*>(data))
; | 65 OwnPtr<WebTaskRunner::Task> task = adoptPtr(static_cast<WebTaskRunner::Task*
>(data)); |
66 task->run(); | 66 task->run(); |
67 } | 67 } |
68 | 68 |
69 void Microtask::enqueueMicrotask(PassOwnPtr<WebThread::Task> callback) | 69 void Microtask::enqueueMicrotask(PassOwnPtr<WebTaskRunner::Task> callback) |
70 { | 70 { |
71 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 71 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
72 isolate->EnqueueMicrotask(µtaskFunctionCallback, callback.leakPtr()); | 72 isolate->EnqueueMicrotask(µtaskFunctionCallback, callback.leakPtr()); |
73 } | 73 } |
74 | 74 |
75 void Microtask::enqueueMicrotask(PassOwnPtr<Closure> callback) | 75 void Microtask::enqueueMicrotask(PassOwnPtr<Closure> callback) |
76 { | 76 { |
77 enqueueMicrotask(adoptPtr(new Task(callback))); | 77 enqueueMicrotask(adoptPtr(new Task(callback))); |
78 } | 78 } |
79 | 79 |
80 } // namespace blink | 80 } // namespace blink |
OLD | NEW |