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" | |
9 #include "bindings/core/v8/ScriptPromise.h" | |
10 #include "bindings/core/v8/ScriptPromiseResolver.h" | |
11 #include "core/dom/DOMException.h" | |
12 #include "core/dom/Document.h" | |
13 #include "core/dom/ExceptionCode.h" | |
14 #include "modules/webusb/USBDevice.h" | |
8 #include "modules/webusb/USBDeviceEnumerationOptions.h" | 15 #include "modules/webusb/USBDeviceEnumerationOptions.h" |
9 #include "modules/webusb/USBDeviceFilter.h" | 16 #include "modules/webusb/USBDeviceFilter.h" |
17 #include "modules/webusb/USBError.h" | |
18 #include "public/platform/Platform.h" | |
19 #include "public/platform/WebVector.h" | |
10 #include "public/platform/modules/webusb/WebUSBClient.h" | 20 #include "public/platform/modules/webusb/WebUSBClient.h" |
11 #include "public/platform/modules/webusb/WebUSBDeviceEnumerationOptions.h" | 21 #include "public/platform/modules/webusb/WebUSBDeviceEnumerationOptions.h" |
12 #include "public/platform/modules/webusb/WebUSBDeviceFilter.h" | 22 #include "public/platform/modules/webusb/WebUSBDeviceFilter.h" |
23 #include "public/platform/modules/webusb/WebUSBError.h" | |
13 | 24 |
14 namespace blink { | 25 namespace blink { |
26 namespace { | |
27 | |
28 void convertDeviceEnumerationOptions(const USBDeviceEnumerationOptions& options, WebUSBDeviceEnumerationOptions* webOptions) | |
29 { | |
30 ASSERT(options.hasFilters()); | |
31 webOptions->filters = WebVector<WebUSBDeviceFilter>(options.filters().size() ); | |
32 for (size_t i = 0; i < options.filters().size(); ++i) { | |
33 const USBDeviceFilter& filter = options.filters()[i]; | |
34 WebUSBDeviceFilter& webFilter = webOptions->filters[i]; | |
35 webFilter.hasVendorID = filter.hasVendorId(); | |
36 if (filter.hasVendorId()) | |
37 webFilter.vendorID = filter.vendorId(); | |
38 webFilter.hasProductID = filter.hasProductId(); | |
39 if (filter.hasProductId()) | |
40 webFilter.productID = filter.productId(); | |
41 webFilter.hasClassCode = filter.hasClassCode(); | |
42 if (filter.hasClassCode()) | |
43 webFilter.classCode = filter.classCode(); | |
44 webFilter.hasSubclassCode = filter.hasSubclassCode(); | |
45 if (filter.hasSubclassCode()) | |
46 webFilter.subclassCode = filter.subclassCode(); | |
47 webFilter.hasProtocolCode = filter.hasProtocolCode(); | |
48 if (filter.hasProtocolCode()) | |
49 webFilter.protocolCode = filter.protocolCode(); | |
50 } | |
51 } | |
52 | |
53 // Allows using a CallbackPromiseAdapter with a WebVector to resolve the | |
54 // getDevices() promise with a HeapVector owning USBDevices. | |
55 class DeviceArray { | |
56 WTF_MAKE_NONCOPYABLE(DeviceArray); | |
ortuno
2015/10/29 01:51:02
question: why did this end up not being STATIC_ONL
haraken
2015/10/29 04:24:57
This should be STATIC_ONLY. And should remove the
| |
57 public: | |
58 using WebType = WebVector<WebUSBDevice*>; | |
59 | |
60 static HeapVector<Member<USBDevice>> take(ScriptPromiseResolver*, PassOwnPtr <WebType> webDevices) | |
61 { | |
62 HeapVector<Member<USBDevice>> devices; | |
63 for (const auto webDevice : *webDevices) | |
64 devices.append(USBDevice::create(adoptPtr(webDevice))); | |
65 return devices; | |
66 } | |
67 | |
68 private: | |
69 DeviceArray() = delete; | |
70 }; | |
71 | |
72 } // namespace | |
15 | 73 |
16 USB::USB(LocalFrame& frame) | 74 USB::USB(LocalFrame& frame) |
17 : m_controller(USBController::from(frame)) | 75 : m_controller(USBController::from(frame)) |
18 { | 76 { |
19 } | 77 } |
20 | 78 |
21 ScriptPromise USB::getDevices(ScriptState* scriptState, const USBDeviceEnumerati onOptions& options) | 79 ScriptPromise USB::getDevices(ScriptState* scriptState, const USBDeviceEnumerati onOptions& options) |
22 { | 80 { |
81 WebUSBClient* client = m_controller->client(); | |
82 if (!client) | |
83 return ScriptPromise::rejectWithDOMException(scriptState, DOMException:: create(NotSupportedError)); | |
84 | |
85 RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver:: create(scriptState); | |
86 ScriptPromise promise = resolver->promise(); | |
87 | |
88 WebUSBDeviceEnumerationOptions webOptions; | |
89 convertDeviceEnumerationOptions(options, &webOptions); | |
90 | |
91 // TODO(rockot): Re-enable this after CPA changes land. | |
92 // That's https://codereview.chromium.org/1240763002/ and dependent patches. | |
93 // client->getDevices(webOptions, new CallbackPromiseAdapter<DeviceArray, US BError>(resolver)); | |
23 ASSERT_NOT_REACHED(); | 94 ASSERT_NOT_REACHED(); |
24 return ScriptPromise(); | 95 |
96 return promise; | |
25 } | 97 } |
26 | 98 |
27 DEFINE_TRACE(USB) | 99 DEFINE_TRACE(USB) |
28 { | 100 { |
29 visitor->trace(m_controller); | 101 visitor->trace(m_controller); |
30 } | 102 } |
31 | 103 |
32 } // namespace blink | 104 } // namespace blink |
OLD | NEW |