| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 ActiveDOMObject(executionContext), | 68 ActiveDOMObject(executionContext), |
| 69 m_accessor(std::move(accessor)), | 69 m_accessor(std::move(accessor)), |
| 70 m_sysexEnabled(sysexEnabled), | 70 m_sysexEnabled(sysexEnabled), |
| 71 m_hasPendingActivity(false) { | 71 m_hasPendingActivity(false) { |
| 72 ThreadState::current()->registerPreFinalizer(this); | 72 ThreadState::current()->registerPreFinalizer(this); |
| 73 m_accessor->setClient(this); | 73 m_accessor->setClient(this); |
| 74 for (size_t i = 0; i < ports.size(); ++i) { | 74 for (size_t i = 0; i < ports.size(); ++i) { |
| 75 const MIDIAccessInitializer::PortDescriptor& port = ports[i]; | 75 const MIDIAccessInitializer::PortDescriptor& port = ports[i]; |
| 76 if (port.type == MIDIPort::TypeInput) { | 76 if (port.type == MIDIPort::TypeInput) { |
| 77 m_inputs.append(MIDIInput::create(this, port.id, port.manufacturer, | 77 m_inputs.append(MIDIInput::create(this, port.id, port.manufacturer, |
| 78 port.name, port.version, port.state)); | 78 port.name, port.version, |
| 79 ToDeviceState(port.state))); |
| 79 } else { | 80 } else { |
| 80 m_outputs.append(MIDIOutput::create(this, m_outputs.size(), port.id, | 81 m_outputs.append(MIDIOutput::create( |
| 81 port.manufacturer, port.name, | 82 this, m_outputs.size(), port.id, port.manufacturer, port.name, |
| 82 port.version, port.state)); | 83 port.version, ToDeviceState(port.state))); |
| 83 } | 84 } |
| 84 } | 85 } |
| 85 } | 86 } |
| 86 | 87 |
| 87 MIDIAccess::~MIDIAccess() {} | 88 MIDIAccess::~MIDIAccess() {} |
| 88 | 89 |
| 89 void MIDIAccess::dispose() { | 90 void MIDIAccess::dispose() { |
| 90 m_accessor.reset(); | 91 m_accessor.reset(); |
| 91 } | 92 } |
| 92 | 93 |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 } | 241 } |
| 241 | 242 |
| 242 DEFINE_TRACE(MIDIAccess) { | 243 DEFINE_TRACE(MIDIAccess) { |
| 243 visitor->trace(m_inputs); | 244 visitor->trace(m_inputs); |
| 244 visitor->trace(m_outputs); | 245 visitor->trace(m_outputs); |
| 245 EventTargetWithInlineData::trace(visitor); | 246 EventTargetWithInlineData::trace(visitor); |
| 246 ActiveDOMObject::trace(visitor); | 247 ActiveDOMObject::trace(visitor); |
| 247 } | 248 } |
| 248 | 249 |
| 249 } // namespace blink | 250 } // namespace blink |
| OLD | NEW |