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 "public/platform/WebThread.h" | |
35 #include "wtf/Vector.h" | 36 #include "wtf/Vector.h" |
36 #include <v8.h> | 37 #include <v8.h> |
37 | 38 |
38 namespace WebCore { | 39 namespace WebCore { |
39 | 40 |
40 typedef Vector<MicrotaskCallback> MicrotaskQueue; | 41 typedef Vector<blink::WebThread::Task*> MicrotaskQueue; |
abarth-chromium
2014/04/18 16:01:04
Vector<OwnPtr<blink::WebThread::Task> >
?
| |
41 | 42 |
42 static MicrotaskQueue& microtaskQueue() | 43 static MicrotaskQueue& microtaskQueue() |
43 { | 44 { |
44 DEFINE_STATIC_LOCAL(MicrotaskQueue, microtaskQueue, ()); | 45 DEFINE_STATIC_LOCAL(MicrotaskQueue, microtaskQueue, ()); |
45 return microtaskQueue; | 46 return microtaskQueue; |
46 } | 47 } |
47 | 48 |
48 void Microtask::performCheckpoint() | 49 void Microtask::performCheckpoint() |
49 { | 50 { |
50 V8PerIsolateData* isolateData = V8PerIsolateData::from(v8::Isolate::GetCurre nt()); | 51 V8PerIsolateData* isolateData = V8PerIsolateData::from(v8::Isolate::GetCurre nt()); |
51 ASSERT(isolateData); | 52 ASSERT(isolateData); |
52 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo int()) | 53 if (isolateData->recursionLevel() || isolateData->performingMicrotaskCheckpo int()) |
53 return; | 54 return; |
54 isolateData->setPerformingMicrotaskCheckpoint(true); | 55 isolateData->setPerformingMicrotaskCheckpoint(true); |
55 | 56 |
56 while (!microtaskQueue().isEmpty()) { | 57 while (!microtaskQueue().isEmpty()) { |
57 Vector<MicrotaskCallback> microtasks; | 58 Vector<blink::WebThread::Task*> microtasks; |
58 microtasks.swap(microtaskQueue()); | 59 microtasks.swap(microtaskQueue()); |
59 for (size_t i = 0; i < microtasks.size(); ++i) { | 60 for (size_t i = 0; i < microtasks.size(); ++i) { |
60 microtasks[i](); | 61 microtasks[i]->run(); |
62 delete microtasks[i]; | |
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(blink::WebThread::Task* callback) |
68 { | 70 { |
69 microtaskQueue().append(callback); | 71 microtaskQueue().append(callback); |
70 } | 72 } |
71 | 73 |
72 } // namespace WebCore | 74 } // namespace WebCore |
OLD | NEW |