OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "config.h" | 5 #include "config.h" |
6 #include "modules/webusb/USB.h" | 6 #include "modules/webusb/USB.h" |
7 | 7 |
8 #include "bindings/core/v8/CallbackPromiseAdapter.h" | 8 #include "bindings/core/v8/CallbackPromiseAdapter.h" |
9 #include "bindings/core/v8/ScriptPromise.h" | 9 #include "bindings/core/v8/ScriptPromise.h" |
10 #include "bindings/core/v8/ScriptPromiseResolver.h" | 10 #include "bindings/core/v8/ScriptPromiseResolver.h" |
11 #include "core/dom/DOMException.h" | 11 #include "core/dom/DOMException.h" |
12 #include "core/dom/Document.h" | 12 #include "core/dom/Document.h" |
13 #include "core/dom/ExceptionCode.h" | 13 #include "core/dom/ExceptionCode.h" |
14 #include "modules/EventTargetModules.h" | 14 #include "modules/EventTargetModules.h" |
15 #include "modules/webusb/USBConnectionEvent.h" | 15 #include "modules/webusb/USBConnectionEvent.h" |
16 #include "modules/webusb/USBController.h" | 16 #include "modules/webusb/USBController.h" |
17 #include "modules/webusb/USBDevice.h" | 17 #include "modules/webusb/USBDevice.h" |
18 #include "modules/webusb/USBDeviceFilter.h" | 18 #include "modules/webusb/USBDeviceFilter.h" |
19 #include "modules/webusb/USBDeviceRequestOptions.h" | 19 #include "modules/webusb/USBDeviceRequestOptions.h" |
20 #include "modules/webusb/USBError.h" | 20 #include "modules/webusb/USBError.h" |
| 21 #include "platform/UserGestureIndicator.h" |
21 #include "public/platform/Platform.h" | 22 #include "public/platform/Platform.h" |
22 #include "public/platform/WebVector.h" | 23 #include "public/platform/WebVector.h" |
23 #include "public/platform/modules/webusb/WebUSBClient.h" | 24 #include "public/platform/modules/webusb/WebUSBClient.h" |
24 #include "public/platform/modules/webusb/WebUSBDeviceFilter.h" | 25 #include "public/platform/modules/webusb/WebUSBDeviceFilter.h" |
25 #include "public/platform/modules/webusb/WebUSBDeviceRequestOptions.h" | 26 #include "public/platform/modules/webusb/WebUSBDeviceRequestOptions.h" |
26 #include "public/platform/modules/webusb/WebUSBError.h" | 27 #include "public/platform/modules/webusb/WebUSBError.h" |
27 | 28 |
28 namespace blink { | 29 namespace blink { |
29 namespace { | 30 namespace { |
30 | 31 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 { | 87 { |
87 if (m_client) | 88 if (m_client) |
88 m_client->setObserver(nullptr); | 89 m_client->setObserver(nullptr); |
89 } | 90 } |
90 | 91 |
91 ScriptPromise USB::getDevices(ScriptState* scriptState) | 92 ScriptPromise USB::getDevices(ScriptState* scriptState) |
92 { | 93 { |
93 if (!m_client) | 94 if (!m_client) |
94 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(NotSupportedError)); | 95 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(NotSupportedError)); |
95 | 96 |
| 97 String errorMessage; |
| 98 if (!scriptState->executionContext()->isSecureContext(errorMessage)) |
| 99 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(SecurityError, errorMessage)); |
| 100 |
96 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; | 101 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; |
97 ScriptPromise promise = resolver->promise(); | 102 ScriptPromise promise = resolver->promise(); |
98 m_client->getDevices(new CallbackPromiseAdapter<DeviceArray, USBError>(resol
ver)); | 103 m_client->getDevices(new CallbackPromiseAdapter<DeviceArray, USBError>(resol
ver)); |
99 | 104 |
100 return promise; | 105 return promise; |
101 } | 106 } |
102 | 107 |
103 ScriptPromise USB::requestDevice(ScriptState* scriptState, const USBDeviceReques
tOptions& options) | 108 ScriptPromise USB::requestDevice(ScriptState* scriptState, const USBDeviceReques
tOptions& options) |
104 { | 109 { |
105 if (!m_client) | 110 if (!m_client) |
106 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(NotSupportedError)); | 111 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(NotSupportedError)); |
107 | 112 |
| 113 String errorMessage; |
| 114 if (!scriptState->executionContext()->isSecureContext(errorMessage)) |
| 115 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(SecurityError, errorMessage)); |
| 116 |
| 117 if (!UserGestureIndicator::consumeUserGesture()) |
| 118 return ScriptPromise::rejectWithDOMException(scriptState, DOMException::
create(SecurityError, "Must be handling a user gesture to show a permission requ
est.")); |
| 119 |
108 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; | 120 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; |
109 ScriptPromise promise = resolver->promise(); | 121 ScriptPromise promise = resolver->promise(); |
110 | 122 |
111 WebUSBDeviceRequestOptions webOptions; | 123 WebUSBDeviceRequestOptions webOptions; |
112 convertDeviceRequestOptions(options, &webOptions); | 124 convertDeviceRequestOptions(options, &webOptions); |
113 m_client->requestDevice(webOptions, new CallbackPromiseAdapter<USBDevice, US
BError>(resolver)); | 125 m_client->requestDevice(webOptions, new CallbackPromiseAdapter<USBDevice, US
BError>(resolver)); |
114 | 126 |
115 return promise; | 127 return promise; |
116 } | 128 } |
117 | 129 |
(...skipping 24 matching lines...) Expand all Loading... |
142 dispatchEvent(USBConnectionEvent::create(EventTypeNames::disconnect, USBDevi
ce::create(device.release()))); | 154 dispatchEvent(USBConnectionEvent::create(EventTypeNames::disconnect, USBDevi
ce::create(device.release()))); |
143 } | 155 } |
144 | 156 |
145 DEFINE_TRACE(USB) | 157 DEFINE_TRACE(USB) |
146 { | 158 { |
147 RefCountedGarbageCollectedEventTargetWithInlineData<USB>::trace(visitor); | 159 RefCountedGarbageCollectedEventTargetWithInlineData<USB>::trace(visitor); |
148 LocalFrameLifecycleObserver::trace(visitor); | 160 LocalFrameLifecycleObserver::trace(visitor); |
149 } | 161 } |
150 | 162 |
151 } // namespace blink | 163 } // namespace blink |
OLD | NEW |