OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2010 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2010 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
12 * | 12 * |
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 * | 24 * |
25 */ | 25 */ |
26 | 26 |
27 #include "core/workers/WorkerEventQueue.h" | 27 #include "core/workers/WorkerEventQueue.h" |
28 | 28 |
| 29 #include "core/dom/TaskRunnerHelper.h" |
29 #include "core/events/Event.h" | 30 #include "core/events/Event.h" |
30 #include "core/probe/CoreProbes.h" | 31 #include "core/probe/CoreProbes.h" |
31 #include "core/workers/WorkerGlobalScope.h" | 32 #include "core/workers/WorkerGlobalScope.h" |
32 #include "core/workers/WorkerThread.h" | 33 #include "core/workers/WorkerThread.h" |
33 | 34 |
34 namespace blink { | 35 namespace blink { |
35 | 36 |
36 WorkerEventQueue* WorkerEventQueue::create( | 37 WorkerEventQueue* WorkerEventQueue::create( |
37 WorkerGlobalScope* workerGlobalScope) { | 38 WorkerGlobalScope* workerGlobalScope) { |
38 return new WorkerEventQueue(workerGlobalScope); | 39 return new WorkerEventQueue(workerGlobalScope); |
(...skipping 11 matching lines...) Expand all Loading... |
50 visitor->trace(m_pendingEvents); | 51 visitor->trace(m_pendingEvents); |
51 EventQueue::trace(visitor); | 52 EventQueue::trace(visitor); |
52 } | 53 } |
53 | 54 |
54 bool WorkerEventQueue::enqueueEvent(Event* event) { | 55 bool WorkerEventQueue::enqueueEvent(Event* event) { |
55 if (m_isClosed) | 56 if (m_isClosed) |
56 return false; | 57 return false; |
57 probe::asyncTaskScheduled(event->target()->getExecutionContext(), | 58 probe::asyncTaskScheduled(event->target()->getExecutionContext(), |
58 event->type(), event); | 59 event->type(), event); |
59 m_pendingEvents.insert(event); | 60 m_pendingEvents.insert(event); |
60 m_workerGlobalScope->thread()->postTask( | 61 // TODO(nhiroki): Callers of enqueueEvent() should specify the task type. |
61 BLINK_FROM_HERE, | 62 TaskRunnerHelper::get(TaskType::MiscPlatformAPI, m_workerGlobalScope.get()) |
62 WTF::bind(&WorkerEventQueue::dispatchEvent, wrapPersistent(this), | 63 ->postTask(BLINK_FROM_HERE, |
63 wrapWeakPersistent(event))); | 64 WTF::bind(&WorkerEventQueue::dispatchEvent, |
| 65 wrapPersistent(this), wrapWeakPersistent(event))); |
64 return true; | 66 return true; |
65 } | 67 } |
66 | 68 |
67 bool WorkerEventQueue::cancelEvent(Event* event) { | 69 bool WorkerEventQueue::cancelEvent(Event* event) { |
68 if (!removeEvent(event)) | 70 if (!removeEvent(event)) |
69 return false; | 71 return false; |
70 probe::asyncTaskCanceled(event->target()->getExecutionContext(), event); | 72 probe::asyncTaskCanceled(event->target()->getExecutionContext(), event); |
71 return true; | 73 return true; |
72 } | 74 } |
73 | 75 |
(...skipping 14 matching lines...) Expand all Loading... |
88 | 90 |
89 void WorkerEventQueue::dispatchEvent(Event* event) { | 91 void WorkerEventQueue::dispatchEvent(Event* event) { |
90 if (!event || !removeEvent(event)) | 92 if (!event || !removeEvent(event)) |
91 return; | 93 return; |
92 | 94 |
93 probe::AsyncTask asyncTask(m_workerGlobalScope, event); | 95 probe::AsyncTask asyncTask(m_workerGlobalScope, event); |
94 event->target()->dispatchEvent(event); | 96 event->target()->dispatchEvent(event); |
95 } | 97 } |
96 | 98 |
97 } // namespace blink | 99 } // namespace blink |
OLD | NEW |