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

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

Issue 2657443005: Migrate WTF::HashSet::add() to ::insert() [part 1 of N] (Closed)
Patch Set: Created 3 years, 11 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/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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); 82 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
83 ScriptPromise promise = resolver->promise(); 83 ScriptPromise promise = resolver->promise();
84 if (!m_deviceManager) { 84 if (!m_deviceManager) {
85 resolver->reject(DOMException::create(NotSupportedError)); 85 resolver->reject(DOMException::create(NotSupportedError));
86 } else { 86 } else {
87 String errorMessage; 87 String errorMessage;
88 if (!executionContext->isSecureContext(errorMessage)) { 88 if (!executionContext->isSecureContext(errorMessage)) {
89 resolver->reject(DOMException::create(SecurityError, errorMessage)); 89 resolver->reject(DOMException::create(SecurityError, errorMessage));
90 } else { 90 } else {
91 m_deviceManagerRequests.add(resolver); 91 m_deviceManagerRequests.insert(resolver);
92 m_deviceManager->GetDevices( 92 m_deviceManager->GetDevices(
93 nullptr, convertToBaseCallback(WTF::bind(&USB::onGetDevices, 93 nullptr, convertToBaseCallback(WTF::bind(&USB::onGetDevices,
94 wrapPersistent(this), 94 wrapPersistent(this),
95 wrapPersistent(resolver)))); 95 wrapPersistent(resolver))));
96 } 96 }
97 } 97 }
98 return promise; 98 return promise;
99 } 99 }
100 100
101 ScriptPromise USB::requestDevice(ScriptState* scriptState, 101 ScriptPromise USB::requestDevice(ScriptState* scriptState,
(...skipping 26 matching lines...) Expand all
128 resolver->reject(DOMException::create( 128 resolver->reject(DOMException::create(
129 SecurityError, 129 SecurityError,
130 "Must be handling a user gesture to show a permission request.")); 130 "Must be handling a user gesture to show a permission request."));
131 } else { 131 } else {
132 Vector<usb::DeviceFilterPtr> filters; 132 Vector<usb::DeviceFilterPtr> filters;
133 if (options.hasFilters()) { 133 if (options.hasFilters()) {
134 filters.reserveCapacity(options.filters().size()); 134 filters.reserveCapacity(options.filters().size());
135 for (const auto& filter : options.filters()) 135 for (const auto& filter : options.filters())
136 filters.push_back(convertDeviceFilter(filter)); 136 filters.push_back(convertDeviceFilter(filter));
137 } 137 }
138 m_chooserServiceRequests.add(resolver); 138 m_chooserServiceRequests.insert(resolver);
139 m_chooserService->GetPermission( 139 m_chooserService->GetPermission(
140 std::move(filters), convertToBaseCallback(WTF::bind( 140 std::move(filters), convertToBaseCallback(WTF::bind(
141 &USB::onGetPermission, wrapPersistent(this), 141 &USB::onGetPermission, wrapPersistent(this),
142 wrapPersistent(resolver)))); 142 wrapPersistent(resolver))));
143 } 143 }
144 return promise; 144 return promise;
145 } 145 }
146 146
147 ExecutionContext* USB::getExecutionContext() const { 147 ExecutionContext* USB::getExecutionContext() const {
148 return ContextLifecycleObserver::getExecutionContext(); 148 return ContextLifecycleObserver::getExecutionContext();
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 249
250 DEFINE_TRACE(USB) { 250 DEFINE_TRACE(USB) {
251 visitor->trace(m_deviceManagerRequests); 251 visitor->trace(m_deviceManagerRequests);
252 visitor->trace(m_chooserServiceRequests); 252 visitor->trace(m_chooserServiceRequests);
253 visitor->trace(m_deviceCache); 253 visitor->trace(m_deviceCache);
254 EventTargetWithInlineData::trace(visitor); 254 EventTargetWithInlineData::trace(visitor);
255 ContextLifecycleObserver::trace(visitor); 255 ContextLifecycleObserver::trace(visitor);
256 } 256 }
257 257
258 } // namespace blink 258 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/websockets/DOMWebSocket.cpp ('k') | third_party/WebKit/Source/modules/webusb/USBDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698