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

Side by Side Diff: content/browser/media/midi_host.cc

Issue 2742333002: Remove ScopedVector from content/browser/ [1]. (Closed)
Patch Set: Created 3 years, 9 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "content/browser/media/midi_host.h" 5 #include "content/browser/media/midi_host.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/memory/ptr_util.h"
9 #include "base/process/process.h" 10 #include "base/process/process.h"
10 #include "base/trace_event/trace_event.h" 11 #include "base/trace_event/trace_event.h"
11 #include "content/browser/bad_message.h" 12 #include "content/browser/bad_message.h"
12 #include "content/browser/browser_main_loop.h" 13 #include "content/browser/browser_main_loop.h"
13 #include "content/browser/child_process_security_policy_impl.h" 14 #include "content/browser/child_process_security_policy_impl.h"
14 #include "content/common/media/midi_messages.h" 15 #include "content/common/media/midi_messages.h"
15 #include "content/public/browser/content_browser_client.h" 16 #include "content/public/browser/content_browser_client.h"
16 #include "content/public/browser/user_metrics.h" 17 #include "content/public/browser/user_metrics.h"
17 #include "media/midi/message_util.h" 18 #include "media/midi/message_util.h"
18 #include "media/midi/midi_message_queue.h" 19 #include "media/midi/midi_message_queue.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 size_t length, 175 size_t length,
175 double timestamp) { 176 double timestamp) {
176 TRACE_EVENT0("midi", "MidiHost::ReceiveMidiData"); 177 TRACE_EVENT0("midi", "MidiHost::ReceiveMidiData");
177 178
178 base::AutoLock auto_lock(messages_queues_lock_); 179 base::AutoLock auto_lock(messages_queues_lock_);
179 if (received_messages_queues_.size() <= port) 180 if (received_messages_queues_.size() <= port)
180 return; 181 return;
181 182
182 // Lazy initialization 183 // Lazy initialization
183 if (received_messages_queues_[port] == nullptr) 184 if (received_messages_queues_[port] == nullptr)
184 received_messages_queues_[port] = new midi::MidiMessageQueue(true); 185 received_messages_queues_[port] =
186 base::MakeUnique<midi::MidiMessageQueue>(true);
185 187
186 received_messages_queues_[port]->Add(data, length); 188 received_messages_queues_[port]->Add(data, length);
187 std::vector<uint8_t> message; 189 std::vector<uint8_t> message;
188 while (true) { 190 while (true) {
189 received_messages_queues_[port]->Get(&message); 191 received_messages_queues_[port]->Get(&message);
190 if (message.empty()) 192 if (message.empty())
191 break; 193 break;
192 194
193 // MIDI devices may send a system exclusive messages even if the renderer 195 // MIDI devices may send a system exclusive messages even if the renderer
194 // doesn't have a permission to receive it. Don't kill the renderer as 196 // doesn't have a permission to receive it. Don't kill the renderer as
(...skipping 23 matching lines...) Expand all
218 bytes_sent_since_last_acknowledgement_)); 220 bytes_sent_since_last_acknowledgement_));
219 bytes_sent_since_last_acknowledgement_ = 0; 221 bytes_sent_since_last_acknowledgement_ = 0;
220 } 222 }
221 } 223 }
222 224
223 void MidiHost::Detach() { 225 void MidiHost::Detach() {
224 midi_service_ = nullptr; 226 midi_service_ = nullptr;
225 } 227 }
226 228
227 } // namespace content 229 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698