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 14 matching lines...) Expand all Loading... |
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 "config.h" | 31 #include "config.h" |
32 #include "core/dom/Microtask.h" | 32 #include "core/dom/Microtask.h" |
33 | 33 |
34 #include "bindings/v8/V8PerIsolateData.h" | 34 #include "bindings/v8/V8PerIsolateData.h" |
| 35 #include "platform/Task.h" |
| 36 #include "public/platform/WebThread.h" |
35 #include "wtf/Vector.h" | 37 #include "wtf/Vector.h" |
36 #include <v8.h> | 38 #include <v8.h> |
37 | 39 |
38 namespace WebCore { | 40 namespace WebCore { |
39 | 41 |
40 typedef Vector<MicrotaskCallback> MicrotaskQueue; | 42 typedef Vector<OwnPtr<blink::WebThread::Task> > MicrotaskQueue; |
41 | 43 |
42 static MicrotaskQueue& microtaskQueue() | 44 static MicrotaskQueue& microtaskQueue() |
43 { | 45 { |
44 DEFINE_STATIC_LOCAL(MicrotaskQueue, microtaskQueue, ()); | 46 DEFINE_STATIC_LOCAL(MicrotaskQueue, microtaskQueue, ()); |
45 return microtaskQueue; | 47 return microtaskQueue; |
46 } | 48 } |
47 | 49 |
48 void Microtask::performCheckpoint() | 50 void Microtask::performCheckpoint() |
49 { | 51 { |
50 V8PerIsolateData* isolateData = V8PerIsolateData::from(v8::Isolate::GetCurre
nt()); | 52 V8PerIsolateData* isolateData = V8PerIsolateData::from(v8::Isolate::GetCurre
nt()); |
51 ASSERT(isolateData); | 53 ASSERT(isolateData); |
52 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo
int()) | 54 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo
int()) |
53 return; | 55 return; |
54 isolateData->setPerformingMicrotaskCheckpoint(true); | 56 isolateData->setPerformingMicrotaskCheckpoint(true); |
55 | 57 |
56 while (!microtaskQueue().isEmpty()) { | 58 while (!microtaskQueue().isEmpty()) { |
57 Vector<MicrotaskCallback> microtasks; | 59 MicrotaskQueue microtasks; |
58 microtasks.swap(microtaskQueue()); | 60 microtasks.swap(microtaskQueue()); |
59 for (size_t i = 0; i < microtasks.size(); ++i) { | 61 for (size_t i = 0; i < microtasks.size(); ++i) { |
60 microtasks[i](); | 62 microtasks[i]->run(); |
61 } | 63 } |
62 } | 64 } |
63 | 65 |
64 isolateData->setPerformingMicrotaskCheckpoint(false); | 66 isolateData->setPerformingMicrotaskCheckpoint(false); |
65 } | 67 } |
66 | 68 |
67 void Microtask::enqueueMicrotask(MicrotaskCallback callback) | 69 void Microtask::enqueueMicrotask(PassOwnPtr<blink::WebThread::Task> callback) |
68 { | 70 { |
69 microtaskQueue().append(callback); | 71 microtaskQueue().append(callback); |
70 } | 72 } |
71 | 73 |
| 74 void Microtask::enqueueMicrotask(const Closure& callback) |
| 75 { |
| 76 enqueueMicrotask(adoptPtr(new Task(callback))); |
| 77 } |
72 } // namespace WebCore | 78 } // namespace WebCore |
OLD | NEW |