diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-05 17:34:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-06 10:04:14 +0000 |
| commit | eaf1da4d961fbbda9455f9af3b23d1af777f43fa (patch) | |
| tree | 95970599ecee31c4f7f940bc97ac98c61a3d0cad /chromium/media/midi/midi_manager_mac.cc | |
| parent | 38a9a29f4f9436cace7f0e7abf9c586057df8a4e (diff) | |
BASELINE: Update Chromium to 73.0.3683.64
Change-Id: I76517dc277ba4e16bfd7e098fda3d079656b3b9f
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/media/midi/midi_manager_mac.cc')
| -rw-r--r-- | chromium/media/midi/midi_manager_mac.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/media/midi/midi_manager_mac.cc b/chromium/media/midi/midi_manager_mac.cc index ecd6e9d46bd..df322462923 100644 --- a/chromium/media/midi/midi_manager_mac.cc +++ b/chromium/media/midi/midi_manager_mac.cc @@ -118,9 +118,10 @@ MidiManager* MidiManager::Create(MidiService* service) { MidiManagerMac::MidiManagerMac(MidiService* service) : MidiManager(service) {} MidiManagerMac::~MidiManagerMac() { - bool result = service()->task_service()->UnbindInstance(); - CHECK(result); + if (!service()->task_service()->UnbindInstance()) + return; + // Finalization steps should be implemented after the UnbindInstance() call. // Do not need to dispose |coremidi_input_| and |coremidi_output_| explicitly. // CoreMIDI automatically disposes them on the client disposal. base::AutoLock lock(midi_client_lock_); @@ -129,10 +130,9 @@ MidiManagerMac::~MidiManagerMac() { } void MidiManagerMac::StartInitialization() { - if (!service()->task_service()->BindInstance()) { - NOTREACHED(); + if (!service()->task_service()->BindInstance()) return CompleteInitialization(Result::INITIALIZATION_ERROR); - } + service()->task_service()->PostBoundTask( kClientTaskRunner, base::BindOnce(&MidiManagerMac::InitializeCoreMIDI, base::Unretained(this))); |