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