| 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 "modules/webusb/USB.h" | 5 #include "modules/webusb/USB.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 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; | 80 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; |
| 81 ScriptPromise promise = resolver->promise(); | 81 ScriptPromise promise = resolver->promise(); |
| 82 if (!m_deviceManager) { | 82 if (!m_deviceManager) { |
| 83 resolver->reject(DOMException::create(NotSupportedError)); | 83 resolver->reject(DOMException::create(NotSupportedError)); |
| 84 } else { | 84 } else { |
| 85 String errorMessage; | 85 String errorMessage; |
| 86 if (!scriptState->getExecutionContext()->isSecureContext(errorMessage))
{ | 86 if (!scriptState->getExecutionContext()->isSecureContext(errorMessage))
{ |
| 87 resolver->reject(DOMException::create(SecurityError, errorMessage)); | 87 resolver->reject(DOMException::create(SecurityError, errorMessage)); |
| 88 } else { | 88 } else { |
| 89 m_deviceManagerRequests.add(resolver); | 89 m_deviceManagerRequests.add(resolver); |
| 90 m_deviceManager->GetDevices(nullptr, createBaseCallback(bind<mojo::W
TFArray<usb::DeviceInfoPtr>>(&USB::onGetDevices, this, resolver))); | 90 m_deviceManager->GetDevices(nullptr, createBaseCallback(bind<mojo::W
TFArray<usb::DeviceInfoPtr>>(&USB::onGetDevices, retainedRef(this), retainedRef(
resolver)))); |
| 91 } | 91 } |
| 92 } | 92 } |
| 93 return promise; | 93 return promise; |
| 94 } | 94 } |
| 95 | 95 |
| 96 ScriptPromise USB::requestDevice(ScriptState* scriptState, const USBDeviceReques
tOptions& options) | 96 ScriptPromise USB::requestDevice(ScriptState* scriptState, const USBDeviceReques
tOptions& options) |
| 97 { | 97 { |
| 98 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; | 98 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState)
; |
| 99 ScriptPromise promise = resolver->promise(); | 99 ScriptPromise promise = resolver->promise(); |
| 100 | 100 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 114 } else if (!UserGestureIndicator::consumeUserGesture()) { | 114 } else if (!UserGestureIndicator::consumeUserGesture()) { |
| 115 resolver->reject(DOMException::create(SecurityError, "Must be handling a
user gesture to show a permission request.")); | 115 resolver->reject(DOMException::create(SecurityError, "Must be handling a
user gesture to show a permission request.")); |
| 116 } else { | 116 } else { |
| 117 Vector<usb::DeviceFilterPtr> filters; | 117 Vector<usb::DeviceFilterPtr> filters; |
| 118 if (options.hasFilters()) { | 118 if (options.hasFilters()) { |
| 119 filters.reserveCapacity(options.filters().size()); | 119 filters.reserveCapacity(options.filters().size()); |
| 120 for (const auto& filter : options.filters()) | 120 for (const auto& filter : options.filters()) |
| 121 filters.append(convertDeviceFilter(filter)); | 121 filters.append(convertDeviceFilter(filter)); |
| 122 } | 122 } |
| 123 m_chooserServiceRequests.add(resolver); | 123 m_chooserServiceRequests.add(resolver); |
| 124 m_chooserService->GetPermission(std::move(filters), createBaseCallback(b
ind<usb::DeviceInfoPtr>(&USB::onGetPermission, this, resolver))); | 124 m_chooserService->GetPermission(std::move(filters), createBaseCallback(b
ind<usb::DeviceInfoPtr>(&USB::onGetPermission, retainedRef(this), retainedRef(re
solver)))); |
| 125 } | 125 } |
| 126 return promise; | 126 return promise; |
| 127 } | 127 } |
| 128 | 128 |
| 129 ExecutionContext* USB::getExecutionContext() const | 129 ExecutionContext* USB::getExecutionContext() const |
| 130 { | 130 { |
| 131 return ContextLifecycleObserver::getExecutionContext(); | 131 return ContextLifecycleObserver::getExecutionContext(); |
| 132 } | 132 } |
| 133 | 133 |
| 134 const AtomicString& USB::interfaceName() const | 134 const AtomicString& USB::interfaceName() const |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 | 207 |
| 208 DEFINE_TRACE(USB) | 208 DEFINE_TRACE(USB) |
| 209 { | 209 { |
| 210 EventTargetWithInlineData::trace(visitor); | 210 EventTargetWithInlineData::trace(visitor); |
| 211 ContextLifecycleObserver::trace(visitor); | 211 ContextLifecycleObserver::trace(visitor); |
| 212 visitor->trace(m_deviceManagerRequests); | 212 visitor->trace(m_deviceManagerRequests); |
| 213 visitor->trace(m_chooserServiceRequests); | 213 visitor->trace(m_chooserServiceRequests); |
| 214 } | 214 } |
| 215 | 215 |
| 216 } // namespace blink | 216 } // namespace blink |
| OLD | NEW |