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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/modules/webusb/USBDevice.cpp

Issue 2108033005: Specify WTF:: prefix for bind() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/webusb/USB.cpp ('k') | third_party/WebKit/Source/platform/SharedBuffer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/webusb/USBDevice.cpp
diff --git a/third_party/WebKit/Source/modules/webusb/USBDevice.cpp b/third_party/WebKit/Source/modules/webusb/USBDevice.cpp
index bca0a3036ea23d6e03d63d5b49c7ee0b13301c8b..200bee8d06ad6548c23da016e1a1bff4c0d6bda6 100644
--- a/third_party/WebKit/Source/modules/webusb/USBDevice.cpp
+++ b/third_party/WebKit/Source/modules/webusb/USBDevice.cpp
@@ -94,7 +94,7 @@ USBDevice::USBDevice(usb::DeviceInfoPtr deviceInfo, usb::DevicePtr device, Execu
, m_configurationIndex(-1)
{
if (m_device)
- m_device.set_connection_error_handler(createBaseCallback(bind(&USBDevice::onConnectionError, wrapWeakPersistent(this))));
+ m_device.set_connection_error_handler(createBaseCallback(WTF::bind(&USBDevice::onConnectionError, wrapWeakPersistent(this))));
int configurationIndex = findConfigurationIndex(info().active_configuration);
if (configurationIndex != -1)
onConfigurationSelected(true /* success */, configurationIndex);
@@ -143,7 +143,7 @@ ScriptPromise USBDevice::open(ScriptState* scriptState)
} else {
m_deviceStateChangeInProgress = true;
m_deviceRequests.add(resolver);
- m_device->Open(createBaseCallback(bind(&USBDevice::asyncOpen, wrapPersistent(this), wrapPersistent(resolver))));
+ m_device->Open(createBaseCallback(WTF::bind(&USBDevice::asyncOpen, wrapPersistent(this), wrapPersistent(resolver))));
}
}
return promise;
@@ -159,7 +159,7 @@ ScriptPromise USBDevice::close(ScriptState* scriptState)
} else {
m_deviceStateChangeInProgress = true;
m_deviceRequests.add(resolver);
- m_device->Close(createBaseCallback(bind(&USBDevice::asyncClose, wrapPersistent(this), wrapPersistent(resolver))));
+ m_device->Close(createBaseCallback(WTF::bind(&USBDevice::asyncClose, wrapPersistent(this), wrapPersistent(resolver))));
}
}
return promise;
@@ -181,7 +181,7 @@ ScriptPromise USBDevice::selectConfiguration(ScriptState* scriptState, uint8_t c
} else {
m_deviceStateChangeInProgress = true;
m_deviceRequests.add(resolver);
- m_device->SetConfiguration(configurationValue, createBaseCallback(bind(&USBDevice::asyncSelectConfiguration, wrapPersistent(this), configurationIndex, wrapPersistent(resolver))));
+ m_device->SetConfiguration(configurationValue, createBaseCallback(WTF::bind(&USBDevice::asyncSelectConfiguration, wrapPersistent(this), configurationIndex, wrapPersistent(resolver))));
}
}
}
@@ -203,7 +203,7 @@ ScriptPromise USBDevice::claimInterface(ScriptState* scriptState, uint8_t interf
} else {
m_interfaceStateChangeInProgress.set(interfaceIndex);
m_deviceRequests.add(resolver);
- m_device->ClaimInterface(interfaceNumber, createBaseCallback(bind(&USBDevice::asyncClaimInterface, wrapPersistent(this), interfaceIndex, wrapPersistent(resolver))));
+ m_device->ClaimInterface(interfaceNumber, createBaseCallback(WTF::bind(&USBDevice::asyncClaimInterface, wrapPersistent(this), interfaceIndex, wrapPersistent(resolver))));
}
}
return promise;
@@ -227,7 +227,7 @@ ScriptPromise USBDevice::releaseInterface(ScriptState* scriptState, uint8_t inte
setEndpointsForInterface(interfaceIndex, false);
m_interfaceStateChangeInProgress.set(interfaceIndex);
m_deviceRequests.add(resolver);
- m_device->ReleaseInterface(interfaceNumber, createBaseCallback(bind(&USBDevice::asyncReleaseInterface, wrapPersistent(this), interfaceIndex, wrapPersistent(resolver))));
+ m_device->ReleaseInterface(interfaceNumber, createBaseCallback(WTF::bind(&USBDevice::asyncReleaseInterface, wrapPersistent(this), interfaceIndex, wrapPersistent(resolver))));
}
}
return promise;
@@ -250,7 +250,7 @@ ScriptPromise USBDevice::selectAlternateInterface(ScriptState* scriptState, uint
setEndpointsForInterface(interfaceIndex, false);
m_interfaceStateChangeInProgress.set(interfaceIndex);
m_deviceRequests.add(resolver);
- m_device->SetInterfaceAlternateSetting(interfaceNumber, alternateSetting, createBaseCallback(bind(&USBDevice::asyncSelectAlternateInterface, wrapPersistent(this), interfaceNumber, alternateSetting, wrapPersistent(resolver))));
+ m_device->SetInterfaceAlternateSetting(interfaceNumber, alternateSetting, createBaseCallback(WTF::bind(&USBDevice::asyncSelectAlternateInterface, wrapPersistent(this), interfaceNumber, alternateSetting, wrapPersistent(resolver))));
}
}
return promise;
@@ -264,7 +264,7 @@ ScriptPromise USBDevice::controlTransferIn(ScriptState* scriptState, const USBCo
auto parameters = convertControlTransferParameters(setup, resolver);
if (parameters) {
m_deviceRequests.add(resolver);
- m_device->ControlTransferIn(std::move(parameters), length, 0, createBaseCallback(bind(&USBDevice::asyncControlTransferIn, wrapPersistent(this), wrapPersistent(resolver))));
+ m_device->ControlTransferIn(std::move(parameters), length, 0, createBaseCallback(WTF::bind(&USBDevice::asyncControlTransferIn, wrapPersistent(this), wrapPersistent(resolver))));
}
}
return promise;
@@ -278,7 +278,7 @@ ScriptPromise USBDevice::controlTransferOut(ScriptState* scriptState, const USBC
auto parameters = convertControlTransferParameters(setup, resolver);
if (parameters) {
m_deviceRequests.add(resolver);
- m_device->ControlTransferOut(std::move(parameters), mojo::WTFArray<uint8_t>(), 0, createBaseCallback(bind(&USBDevice::asyncControlTransferOut, wrapPersistent(this), 0, wrapPersistent(resolver))));
+ m_device->ControlTransferOut(std::move(parameters), mojo::WTFArray<uint8_t>(), 0, createBaseCallback(WTF::bind(&USBDevice::asyncControlTransferOut, wrapPersistent(this), 0, wrapPersistent(resolver))));
}
}
return promise;
@@ -294,7 +294,7 @@ ScriptPromise USBDevice::controlTransferOut(ScriptState* scriptState, const USBC
mojo::WTFArray<uint8_t> buffer = convertBufferSource(data);
unsigned transferLength = buffer.size();
m_deviceRequests.add(resolver);
- m_device->ControlTransferOut(std::move(parameters), std::move(buffer), 0, createBaseCallback(bind(&USBDevice::asyncControlTransferOut, wrapPersistent(this), transferLength, wrapPersistent(resolver))));
+ m_device->ControlTransferOut(std::move(parameters), std::move(buffer), 0, createBaseCallback(WTF::bind(&USBDevice::asyncControlTransferOut, wrapPersistent(this), transferLength, wrapPersistent(resolver))));
}
}
return promise;
@@ -306,7 +306,7 @@ ScriptPromise USBDevice::clearHalt(ScriptState* scriptState, String direction, u
ScriptPromise promise = resolver->promise();
if (ensureEndpointAvailable(direction == "in", endpointNumber, resolver)) {
m_deviceRequests.add(resolver);
- m_device->ClearHalt(endpointNumber, createBaseCallback(bind(&USBDevice::asyncClearHalt, wrapPersistent(this), wrapPersistent(resolver))));
+ m_device->ClearHalt(endpointNumber, createBaseCallback(WTF::bind(&USBDevice::asyncClearHalt, wrapPersistent(this), wrapPersistent(resolver))));
}
return promise;
}
@@ -317,7 +317,7 @@ ScriptPromise USBDevice::transferIn(ScriptState* scriptState, uint8_t endpointNu
ScriptPromise promise = resolver->promise();
if (ensureEndpointAvailable(true /* in */, endpointNumber, resolver)) {
m_deviceRequests.add(resolver);
- m_device->GenericTransferIn(endpointNumber, length, 0, createBaseCallback(bind(&USBDevice::asyncTransferIn, wrapPersistent(this), wrapPersistent(resolver))));
+ m_device->GenericTransferIn(endpointNumber, length, 0, createBaseCallback(WTF::bind(&USBDevice::asyncTransferIn, wrapPersistent(this), wrapPersistent(resolver))));
}
return promise;
}
@@ -330,7 +330,7 @@ ScriptPromise USBDevice::transferOut(ScriptState* scriptState, uint8_t endpointN
mojo::WTFArray<uint8_t> buffer = convertBufferSource(data);
unsigned transferLength = buffer.size();
m_deviceRequests.add(resolver);
- m_device->GenericTransferOut(endpointNumber, std::move(buffer), 0, createBaseCallback(bind(&USBDevice::asyncTransferOut, wrapPersistent(this), transferLength, wrapPersistent(resolver))));
+ m_device->GenericTransferOut(endpointNumber, std::move(buffer), 0, createBaseCallback(WTF::bind(&USBDevice::asyncTransferOut, wrapPersistent(this), transferLength, wrapPersistent(resolver))));
}
return promise;
}
@@ -341,7 +341,7 @@ ScriptPromise USBDevice::isochronousTransferIn(ScriptState* scriptState, uint8_t
ScriptPromise promise = resolver->promise();
if (ensureEndpointAvailable(true /* in */, endpointNumber, resolver)) {
m_deviceRequests.add(resolver);
- m_device->IsochronousTransferIn(endpointNumber, mojo::WTFArray<uint32_t>(std::move(packetLengths)), 0, createBaseCallback(bind(&USBDevice::asyncIsochronousTransferIn, wrapPersistent(this), wrapPersistent(resolver))));
+ m_device->IsochronousTransferIn(endpointNumber, mojo::WTFArray<uint32_t>(std::move(packetLengths)), 0, createBaseCallback(WTF::bind(&USBDevice::asyncIsochronousTransferIn, wrapPersistent(this), wrapPersistent(resolver))));
}
return promise;
}
@@ -352,7 +352,7 @@ ScriptPromise USBDevice::isochronousTransferOut(ScriptState* scriptState, uint8_
ScriptPromise promise = resolver->promise();
if (ensureEndpointAvailable(false /* out */, endpointNumber, resolver)) {
m_deviceRequests.add(resolver);
- m_device->IsochronousTransferOut(endpointNumber, convertBufferSource(data), mojo::WTFArray<uint32_t>(std::move(packetLengths)), 0, createBaseCallback(bind(&USBDevice::asyncIsochronousTransferOut, wrapPersistent(this), wrapPersistent(resolver))));
+ m_device->IsochronousTransferOut(endpointNumber, convertBufferSource(data), mojo::WTFArray<uint32_t>(std::move(packetLengths)), 0, createBaseCallback(WTF::bind(&USBDevice::asyncIsochronousTransferOut, wrapPersistent(this), wrapPersistent(resolver))));
}
return promise;
}
@@ -366,7 +366,7 @@ ScriptPromise USBDevice::reset(ScriptState* scriptState)
resolver->reject(DOMException::create(InvalidStateError, kOpenRequired));
} else {
m_deviceRequests.add(resolver);
- m_device->Reset(createBaseCallback(bind(&USBDevice::asyncReset, wrapPersistent(this), wrapPersistent(resolver))));
+ m_device->Reset(createBaseCallback(WTF::bind(&USBDevice::asyncReset, wrapPersistent(this), wrapPersistent(resolver))));
}
}
return promise;
« no previous file with comments | « third_party/WebKit/Source/modules/webusb/USB.cpp ('k') | third_party/WebKit/Source/platform/SharedBuffer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698