Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/ScriptStreamerThread.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "core/inspector/InspectorTraceEvents.h"
9 #include "platform/TraceEvent.h" 9 #include "platform/TraceEvent.h"
10 #include "public/platform/Platform.h" 10 #include "public/platform/Platform.h"
11 #include "public/platform/WebTaskRunner.h" 11 #include "public/platform/WebTaskRunner.h"
12 #include "public/platform/WebTraceLocation.h" 12 #include "public/platform/WebTraceLocation.h"
13 #include "wtf/PtrUtil.h"
14 #include <memory>
13 15
14 namespace blink { 16 namespace blink {
15 17
16 static ScriptStreamerThread* s_sharedThread = 0; 18 static ScriptStreamerThread* s_sharedThread = 0;
17 // Guards s_sharedThread. s_sharedThread is initialized and deleted in the main 19 // Guards s_sharedThread. s_sharedThread is initialized and deleted in the main
18 // thread, but also used by the streamer thread. Races can occur during 20 // thread, but also used by the streamer thread. Races can occur during
19 // shutdown. 21 // shutdown.
20 static Mutex* s_mutex = 0; 22 static Mutex* s_mutex = 0;
21 23
22 void ScriptStreamerThread::init() 24 void ScriptStreamerThread::init()
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void ScriptStreamerThread::taskDone() 67 void ScriptStreamerThread::taskDone()
66 { 68 {
67 MutexLocker locker(m_mutex); 69 MutexLocker locker(m_mutex);
68 ASSERT(m_runningTask); 70 ASSERT(m_runningTask);
69 m_runningTask = false; 71 m_runningTask = false;
70 } 72 }
71 73
72 WebThread& ScriptStreamerThread::platformThread() 74 WebThread& ScriptStreamerThread::platformThread()
73 { 75 {
74 if (!isRunning()) 76 if (!isRunning())
75 m_thread = adoptPtr(Platform::current()->createThread("ScriptStreamerThr ead")); 77 m_thread = wrapUnique(Platform::current()->createThread("ScriptStreamerT hread"));
76 return *m_thread; 78 return *m_thread;
77 } 79 }
78 80
79 void ScriptStreamerThread::runScriptStreamingTask(PassOwnPtr<v8::ScriptCompiler: :ScriptStreamingTask> task, ScriptStreamer* streamer) 81 void ScriptStreamerThread::runScriptStreamingTask(std::unique_ptr<v8::ScriptComp iler::ScriptStreamingTask> task, ScriptStreamer* streamer)
80 { 82 {
81 TRACE_EVENT1("v8,devtools.timeline", "v8.parseOnBackground", "data", Inspect orParseScriptEvent::data(streamer->scriptResourceIdentifier(), streamer->scriptU RLString())); 83 TRACE_EVENT1("v8,devtools.timeline", "v8.parseOnBackground", "data", Inspect orParseScriptEvent::data(streamer->scriptResourceIdentifier(), streamer->scriptU RLString()));
82 // Running the task can and will block: SourceStream::GetSomeData will get 84 // Running the task can and will block: SourceStream::GetSomeData will get
83 // called and it will block and wait for data from the network. 85 // called and it will block and wait for data from the network.
84 task->Run(); 86 task->Run();
85 streamer->streamingCompleteOnBackgroundThread(); 87 streamer->streamingCompleteOnBackgroundThread();
86 MutexLocker locker(*s_mutex); 88 MutexLocker locker(*s_mutex);
87 ScriptStreamerThread* thread = shared(); 89 ScriptStreamerThread* thread = shared();
88 if (thread) 90 if (thread)
89 thread->taskDone(); 91 thread->taskDone();
90 // If thread is 0, we're shutting down. 92 // If thread is 0, we're shutting down.
91 } 93 }
92 94
93 } // namespace blink 95 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698