| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 void MIDIInput::setOnmidimessage(EventListener* listener) | 59 void MIDIInput::setOnmidimessage(EventListener* listener) |
| 60 { | 60 { |
| 61 // Implicit open. It does nothing if the port is already opened. | 61 // Implicit open. It does nothing if the port is already opened. |
| 62 // See http://www.w3.org/TR/webmidi/#widl-MIDIPort-open-Promise-MIDIPort | 62 // See http://www.w3.org/TR/webmidi/#widl-MIDIPort-open-Promise-MIDIPort |
| 63 open(); | 63 open(); |
| 64 | 64 |
| 65 setAttributeEventListener(EventTypeNames::midimessage, listener); | 65 setAttributeEventListener(EventTypeNames::midimessage, listener); |
| 66 } | 66 } |
| 67 | 67 |
| 68 bool MIDIInput::addEventListenerInternal(const AtomicString& eventType, EventLis
tener* listener, const EventListenerOptions& options) | 68 void MIDIInput::addedEventListener(const AtomicString& eventType, RegisteredEven
tListener& registeredListener) |
| 69 { | 69 { |
| 70 MIDIPort::addedEventListener(eventType, registeredListener); |
| 70 if (eventType == EventTypeNames::midimessage) { | 71 if (eventType == EventTypeNames::midimessage) { |
| 71 // Implicit open. See setOnmidimessage(). | 72 // Implicit open. See setOnmidimessage(). |
| 72 open(); | 73 open(); |
| 73 } | 74 } |
| 74 return EventTarget::addEventListenerInternal(eventType, listener, options); | |
| 75 } | 75 } |
| 76 | 76 |
| 77 void MIDIInput::didReceiveMIDIData(unsigned portIndex, const unsigned char* data
, size_t length, double timeStamp) | 77 void MIDIInput::didReceiveMIDIData(unsigned portIndex, const unsigned char* data
, size_t length, double timeStamp) |
| 78 { | 78 { |
| 79 DCHECK(isMainThread()); | 79 DCHECK(isMainThread()); |
| 80 | 80 |
| 81 if (!length) | 81 if (!length) |
| 82 return; | 82 return; |
| 83 | 83 |
| 84 if (getConnection() != ConnectionStateOpen) | 84 if (getConnection() != ConnectionStateOpen) |
| 85 return; | 85 return; |
| 86 | 86 |
| 87 // Drop sysex message here when the client does not request it. Note that th
is is not a security check but an | 87 // Drop sysex message here when the client does not request it. Note that th
is is not a security check but an |
| 88 // automatic filtering for clients that do not want sysex message. Also note
that sysex message will never be sent | 88 // automatic filtering for clients that do not want sysex message. Also note
that sysex message will never be sent |
| 89 // unless the current process has an explicit permission to handle sysex mes
sage. | 89 // unless the current process has an explicit permission to handle sysex mes
sage. |
| 90 if (data[0] == 0xf0 && !midiAccess()->sysexEnabled()) | 90 if (data[0] == 0xf0 && !midiAccess()->sysexEnabled()) |
| 91 return; | 91 return; |
| 92 DOMUint8Array* array = DOMUint8Array::create(data, length); | 92 DOMUint8Array* array = DOMUint8Array::create(data, length); |
| 93 dispatchEvent(MIDIMessageEvent::create(timeStamp, array)); | 93 dispatchEvent(MIDIMessageEvent::create(timeStamp, array)); |
| 94 } | 94 } |
| 95 | 95 |
| 96 DEFINE_TRACE(MIDIInput) | 96 DEFINE_TRACE(MIDIInput) |
| 97 { | 97 { |
| 98 MIDIPort::trace(visitor); | 98 MIDIPort::trace(visitor); |
| 99 } | 99 } |
| 100 | 100 |
| 101 } // namespace blink | 101 } // namespace blink |
| OLD | NEW |