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

Unified Diff: media/midi/midi_manager_usb.cc

Issue 2262043002: MidiScheduler binds to task runner of constructing thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/midi/midi_manager_usb.h ('k') | media/midi/midi_scheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/midi/midi_manager_usb.cc
diff --git a/media/midi/midi_manager_usb.cc b/media/midi/midi_manager_usb.cc
index e3e74aae386b6f4e26153170f3c3d464c0a4311f..ddd54c214996cb4fdd894ae72cd701e28ba81ced 100644
--- a/media/midi/midi_manager_usb.cc
+++ b/media/midi/midi_manager_usb.cc
@@ -19,6 +19,8 @@ MidiManagerUsb::MidiManagerUsb(std::unique_ptr<UsbMidiDevice::Factory> factory)
: device_factory_(std::move(factory)) {}
MidiManagerUsb::~MidiManagerUsb() {
+ base::AutoLock auto_lock(scheduler_lock_);
+ CHECK(!scheduler_);
}
void MidiManagerUsb::StartInitialization() {
@@ -26,9 +28,20 @@ void MidiManagerUsb::StartInitialization() {
base::Bind(&MidiManager::CompleteInitialization, base::Unretained(this)));
}
+void MidiManagerUsb::Finalize() {
+ // Destruct MidiScheduler on Chrome_IOThread.
+ base::AutoLock auto_lock(scheduler_lock_);
+ scheduler_.reset();
+}
+
void MidiManagerUsb::Initialize(base::Callback<void(Result result)> callback) {
initialize_callback_ = callback;
- scheduler_.reset(new MidiScheduler(this));
+
+ {
+ base::AutoLock auto_lock(scheduler_lock_);
+ scheduler_.reset(new MidiScheduler(this));
+ }
+
// This is safe because EnumerateDevices cancels the operation on destruction.
device_factory_->EnumerateDevices(
this,
« no previous file with comments | « media/midi/midi_manager_usb.h ('k') | media/midi/midi_scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698