OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "modules/webmidi/MIDIAccessInitializer.h" | 5 #include "modules/webmidi/MIDIAccessInitializer.h" |
6 | 6 |
7 #include "bindings/core/v8/ScriptPromise.h" | 7 #include "bindings/core/v8/ScriptPromise.h" |
8 #include "bindings/core/v8/ScriptPromiseResolver.h" | 8 #include "bindings/core/v8/ScriptPromiseResolver.h" |
9 #include "core/dom/DOMException.h" | 9 #include "core/dom/DOMException.h" |
10 #include "core/dom/Document.h" | 10 #include "core/dom/Document.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 void MIDIAccessInitializer::contextDestroyed() { | 33 void MIDIAccessInitializer::contextDestroyed() { |
34 m_permissionService.reset(); | 34 m_permissionService.reset(); |
35 LifecycleObserver::contextDestroyed(); | 35 LifecycleObserver::contextDestroyed(); |
36 } | 36 } |
37 | 37 |
38 ScriptPromise MIDIAccessInitializer::start() { | 38 ScriptPromise MIDIAccessInitializer::start() { |
39 ScriptPromise promise = this->promise(); | 39 ScriptPromise promise = this->promise(); |
40 m_accessor = MIDIAccessor::create(this); | 40 m_accessor = MIDIAccessor::create(this); |
41 | 41 |
42 connectToPermissionService(getExecutionContext(), | 42 connectToPermissionService(getExecutionContext(), |
43 mojo::GetProxy(&m_permissionService)); | 43 mojo::MakeRequest(&m_permissionService)); |
44 m_permissionService->RequestPermission( | 44 m_permissionService->RequestPermission( |
45 createMidiPermissionDescriptor(m_options.hasSysex() && m_options.sysex()), | 45 createMidiPermissionDescriptor(m_options.hasSysex() && m_options.sysex()), |
46 getExecutionContext()->getSecurityOrigin(), | 46 getExecutionContext()->getSecurityOrigin(), |
47 UserGestureIndicator::processingUserGesture(), | 47 UserGestureIndicator::processingUserGesture(), |
48 convertToBaseCallback(WTF::bind( | 48 convertToBaseCallback(WTF::bind( |
49 &MIDIAccessInitializer::onPermissionsUpdated, wrapPersistent(this)))); | 49 &MIDIAccessInitializer::onPermissionsUpdated, wrapPersistent(this)))); |
50 | 50 |
51 return promise; | 51 return promise; |
52 } | 52 } |
53 | 53 |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 | 121 |
122 void MIDIAccessInitializer::onPermissionUpdated(PermissionStatus status) { | 122 void MIDIAccessInitializer::onPermissionUpdated(PermissionStatus status) { |
123 m_permissionService.reset(); | 123 m_permissionService.reset(); |
124 if (status == PermissionStatus::GRANTED) | 124 if (status == PermissionStatus::GRANTED) |
125 m_accessor->startSession(); | 125 m_accessor->startSession(); |
126 else | 126 else |
127 reject(DOMException::create(SecurityError)); | 127 reject(DOMException::create(SecurityError)); |
128 } | 128 } |
129 | 129 |
130 } // namespace blink | 130 } // namespace blink |
OLD | NEW |