| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "web/MIDIClientProxy.h" | 32 #include "web/MIDIClientProxy.h" |
| 33 | 33 |
| 34 #include "modules/webmidi/MIDIAccess.h" | 34 #include "modules/webmidi/MIDIAccessInitializer.h" |
| 35 #include "public/web/WebMIDIClient.h" | 35 #include "public/web/WebMIDIClient.h" |
| 36 #include "public/web/WebMIDIPermissionRequest.h" | 36 #include "public/web/WebMIDIPermissionRequest.h" |
| 37 | 37 |
| 38 using WebCore::MIDIAccess; | |
| 39 | |
| 40 namespace blink { | 38 namespace blink { |
| 41 | 39 |
| 42 MIDIClientProxy::MIDIClientProxy(WebMIDIClient* client) | 40 MIDIClientProxy::MIDIClientProxy(WebMIDIClient* client) |
| 43 : m_client(client) | 41 : m_client(client) |
| 44 { | 42 { |
| 45 } | 43 } |
| 46 | 44 |
| 47 void MIDIClientProxy::requestSysexPermission(PassRefPtrWillBeRawPtr<MIDIAccess>
access) | 45 void MIDIClientProxy::requestSysexPermission(WebCore::MIDIAccessInitializer* ini
tializer) |
| 48 { | 46 { |
| 49 if (m_client) | 47 if (m_client) |
| 50 m_client->requestSysexPermission(WebMIDIPermissionRequest(access)); | 48 m_client->requestSysexPermission(WebMIDIPermissionRequest(initializer)); |
| 51 else | 49 else |
| 52 access->setSysexEnabled(false); | 50 initializer->setSysexEnabled(false); |
| 53 } | 51 } |
| 54 | 52 |
| 55 void MIDIClientProxy::cancelSysexPermissionRequest(MIDIAccess* access) | 53 void MIDIClientProxy::cancelSysexPermissionRequest(WebCore::MIDIAccessInitialize
r* initializer) |
| 56 { | 54 { |
| 57 if (m_client) | 55 if (m_client) |
| 58 m_client->cancelSysexPermissionRequest(WebMIDIPermissionRequest(access))
; | 56 m_client->cancelSysexPermissionRequest(WebMIDIPermissionRequest(initiali
zer)); |
| 59 } | 57 } |
| 60 | 58 |
| 61 } // namespace blink | 59 } // namespace blink |
| OLD | NEW |