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 "bindings/core/v8/ScriptStreamerThread.h" | 5 #include "bindings/core/v8/ScriptStreamerThread.h" |
6 | 6 |
7 #include "bindings/core/v8/ScriptStreamer.h" | 7 #include "bindings/core/v8/ScriptStreamer.h" |
| 8 #include "core/inspector/InspectorTraceEvents.h" |
8 #include "platform/TraceEvent.h" | 9 #include "platform/TraceEvent.h" |
9 #include "public/platform/Platform.h" | 10 #include "public/platform/Platform.h" |
10 #include "public/platform/WebTaskRunner.h" | 11 #include "public/platform/WebTaskRunner.h" |
11 #include "public/platform/WebTraceLocation.h" | 12 #include "public/platform/WebTraceLocation.h" |
12 | 13 |
13 namespace blink { | 14 namespace blink { |
14 | 15 |
15 static ScriptStreamerThread* s_sharedThread = 0; | 16 static ScriptStreamerThread* s_sharedThread = 0; |
16 // Guards s_sharedThread. s_sharedThread is initialized and deleted in the main | 17 // Guards s_sharedThread. s_sharedThread is initialized and deleted in the main |
17 // thread, but also used by the streamer thread. Races can occur during | 18 // thread, but also used by the streamer thread. Races can occur during |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 | 71 |
71 WebThread& ScriptStreamerThread::platformThread() | 72 WebThread& ScriptStreamerThread::platformThread() |
72 { | 73 { |
73 if (!isRunning()) | 74 if (!isRunning()) |
74 m_thread = adoptPtr(Platform::current()->createThread("ScriptStreamerThr
ead")); | 75 m_thread = adoptPtr(Platform::current()->createThread("ScriptStreamerThr
ead")); |
75 return *m_thread; | 76 return *m_thread; |
76 } | 77 } |
77 | 78 |
78 void ScriptStreamerThread::runScriptStreamingTask(WTF::PassOwnPtr<v8::ScriptComp
iler::ScriptStreamingTask> task, ScriptStreamer* streamer) | 79 void ScriptStreamerThread::runScriptStreamingTask(WTF::PassOwnPtr<v8::ScriptComp
iler::ScriptStreamingTask> task, ScriptStreamer* streamer) |
79 { | 80 { |
80 TRACE_EVENT0("v8", "v8.parseOnBackground"); | 81 TRACE_EVENT1("v8,devtools.timeline", "v8.parseOnBackground", "data", Inspect
orParseScriptEvent::data(streamer->scriptResourceIdentifier(), streamer->scriptU
RLString())); |
81 // Running the task can and will block: SourceStream::GetSomeData will get | 82 // Running the task can and will block: SourceStream::GetSomeData will get |
82 // called and it will block and wait for data from the network. | 83 // called and it will block and wait for data from the network. |
83 task->Run(); | 84 task->Run(); |
84 streamer->streamingCompleteOnBackgroundThread(); | 85 streamer->streamingCompleteOnBackgroundThread(); |
85 MutexLocker locker(*s_mutex); | 86 MutexLocker locker(*s_mutex); |
86 ScriptStreamerThread* thread = shared(); | 87 ScriptStreamerThread* thread = shared(); |
87 if (thread) | 88 if (thread) |
88 thread->taskDone(); | 89 thread->taskDone(); |
89 // If thread is 0, we're shutting down. | 90 // If thread is 0, we're shutting down. |
90 } | 91 } |
91 | 92 |
92 } // namespace blink | 93 } // namespace blink |
OLD | NEW |