OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "config.h" | 5 #include "config.h" |
6 #include "bindings/core/v8/ScriptStreamerThread.h" | 6 #include "bindings/core/v8/ScriptStreamerThread.h" |
7 | 7 |
8 #include "bindings/core/v8/ScriptStreamer.h" | 8 #include "bindings/core/v8/ScriptStreamer.h" |
9 #include "platform/Task.h" | 9 #include "platform/Task.h" |
10 #include "platform/TraceEvent.h" | 10 #include "platform/TraceEvent.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 // Now it's safe to delete s_mutex, since there are no tasks that could | 47 // Now it's safe to delete s_mutex, since there are no tasks that could |
48 // access it later. | 48 // access it later. |
49 delete s_mutex; | 49 delete s_mutex; |
50 } | 50 } |
51 | 51 |
52 ScriptStreamerThread* ScriptStreamerThread::shared() | 52 ScriptStreamerThread* ScriptStreamerThread::shared() |
53 { | 53 { |
54 return s_sharedThread; | 54 return s_sharedThread; |
55 } | 55 } |
56 | 56 |
57 void ScriptStreamerThread::postTask(WebThread::Task* task) | 57 void ScriptStreamerThread::postTask(WebTaskRunner::Task* task) |
58 { | 58 { |
59 ASSERT(isMainThread()); | 59 ASSERT(isMainThread()); |
60 MutexLocker locker(m_mutex); | 60 MutexLocker locker(m_mutex); |
61 ASSERT(!m_runningTask); | 61 ASSERT(!m_runningTask); |
62 m_runningTask = true; | 62 m_runningTask = true; |
63 platformThread().postTask(FROM_HERE, task); | 63 platformThread().taskRunner()->postTask(FROM_HERE, task); |
64 } | 64 } |
65 | 65 |
66 void ScriptStreamerThread::taskDone() | 66 void ScriptStreamerThread::taskDone() |
67 { | 67 { |
68 MutexLocker locker(m_mutex); | 68 MutexLocker locker(m_mutex); |
69 ASSERT(m_runningTask); | 69 ASSERT(m_runningTask); |
70 m_runningTask = false; | 70 m_runningTask = false; |
71 } | 71 } |
72 | 72 |
73 WebThread& ScriptStreamerThread::platformThread() | 73 WebThread& ScriptStreamerThread::platformThread() |
(...skipping 11 matching lines...) Expand all Loading... |
85 task->Run(); | 85 task->Run(); |
86 streamer->streamingCompleteOnBackgroundThread(); | 86 streamer->streamingCompleteOnBackgroundThread(); |
87 MutexLocker locker(*s_mutex); | 87 MutexLocker locker(*s_mutex); |
88 ScriptStreamerThread* thread = shared(); | 88 ScriptStreamerThread* thread = shared(); |
89 if (thread) | 89 if (thread) |
90 thread->taskDone(); | 90 thread->taskDone(); |
91 // If thread is 0, we're shutting down. | 91 // If thread is 0, we're shutting down. |
92 } | 92 } |
93 | 93 |
94 } // namespace blink | 94 } // namespace blink |
OLD | NEW |