Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(157)

Side by Side Diff: third_party/WebKit/Source/modules/webusb/USB.cpp

Issue 1781533002: Track USBDevice open state in Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/CallbackPromiseAdapter.h" 7 #include "bindings/core/v8/CallbackPromiseAdapter.h"
8 #include "bindings/core/v8/ScriptPromise.h" 8 #include "bindings/core/v8/ScriptPromise.h"
9 #include "bindings/core/v8/ScriptPromiseResolver.h" 9 #include "bindings/core/v8/ScriptPromiseResolver.h"
10 #include "core/dom/DOMException.h" 10 #include "core/dom/DOMException.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 } 56 }
57 } 57 }
58 58
59 // Allows using a CallbackPromiseAdapter with a WebVector to resolve the 59 // Allows using a CallbackPromiseAdapter with a WebVector to resolve the
60 // getDevices() promise with a HeapVector owning USBDevices. 60 // getDevices() promise with a HeapVector owning USBDevices.
61 class DeviceArray { 61 class DeviceArray {
62 STATIC_ONLY(DeviceArray); 62 STATIC_ONLY(DeviceArray);
63 public: 63 public:
64 using WebType = OwnPtr<WebVector<WebUSBDevice*>>; 64 using WebType = OwnPtr<WebVector<WebUSBDevice*>>;
65 65
66 static HeapVector<Member<USBDevice>> take(ScriptPromiseResolver*, PassOwnPtr <WebVector<WebUSBDevice*>> webDevices) 66 static HeapVector<Member<USBDevice>> take(ScriptPromiseResolver* resolver, P assOwnPtr<WebVector<WebUSBDevice*>> webDevices)
67 { 67 {
68 HeapVector<Member<USBDevice>> devices; 68 HeapVector<Member<USBDevice>> devices;
69 for (const auto webDevice : *webDevices) 69 for (const auto webDevice : *webDevices)
70 devices.append(USBDevice::create(adoptPtr(webDevice))); 70 devices.append(USBDevice::create(adoptPtr(webDevice), resolver->getE xecutionContext()));
71 return devices; 71 return devices;
72 } 72 }
73 }; 73 };
74 74
75 } // namespace 75 } // namespace
76 76
77 USB::USB(LocalFrame& frame) 77 USB::USB(LocalFrame& frame)
78 : LocalFrameLifecycleObserver(&frame) 78 : LocalFrameLifecycleObserver(&frame)
79 , m_client(USBController::from(frame).client()) 79 , m_client(USBController::from(frame).client())
80 { 80 {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 138
139 void USB::willDetachFrameHost() 139 void USB::willDetachFrameHost()
140 { 140 {
141 if (m_client) 141 if (m_client)
142 m_client->setObserver(nullptr); 142 m_client->setObserver(nullptr);
143 m_client = nullptr; 143 m_client = nullptr;
144 } 144 }
145 145
146 void USB::onDeviceConnected(WebPassOwnPtr<WebUSBDevice> device) 146 void USB::onDeviceConnected(WebPassOwnPtr<WebUSBDevice> device)
147 { 147 {
148 dispatchEvent(USBConnectionEvent::create(EventTypeNames::connect, USBDevice: :create(device.release()))); 148 dispatchEvent(USBConnectionEvent::create(EventTypeNames::connect, USBDevice: :create(device.release(), getExecutionContext())));
149 } 149 }
150 150
151 void USB::onDeviceDisconnected(WebPassOwnPtr<WebUSBDevice> device) 151 void USB::onDeviceDisconnected(WebPassOwnPtr<WebUSBDevice> device)
152 { 152 {
153 dispatchEvent(USBConnectionEvent::create(EventTypeNames::disconnect, USBDevi ce::create(device.release()))); 153 dispatchEvent(USBConnectionEvent::create(EventTypeNames::disconnect, USBDevi ce::create(device.release(), getExecutionContext())));
154 } 154 }
155 155
156 DEFINE_TRACE(USB) 156 DEFINE_TRACE(USB)
157 { 157 {
158 RefCountedGarbageCollectedEventTargetWithInlineData<USB>::trace(visitor); 158 RefCountedGarbageCollectedEventTargetWithInlineData<USB>::trace(visitor);
159 LocalFrameLifecycleObserver::trace(visitor); 159 LocalFrameLifecycleObserver::trace(visitor);
160 } 160 }
161 161
162 } // namespace blink 162 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698