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

Unified Diff: third_party/WebKit/LayoutTests/usb/resources/usb-helpers.js

Issue 1784733002: Track USB device configuration state in Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blink_open_state
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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/LayoutTests/usb/resources/usb-helpers.js
diff --git a/third_party/WebKit/LayoutTests/usb/resources/usb-helpers.js b/third_party/WebKit/LayoutTests/usb/resources/usb-helpers.js
index e2148c6e062ee39cba6b6a0ffd1def4ea68ba361..faf30ac5c58e06a93c54dd4cd9acfae75ed57ade 100644
--- a/third_party/WebKit/LayoutTests/usb/resources/usb-helpers.js
+++ b/third_party/WebKit/LayoutTests/usb/resources/usb-helpers.js
@@ -160,9 +160,8 @@ function usbMocks(mojo) {
claimInterface(interfaceNumber) {
assert_true(this.opened_);
-
- if (this.currentConfiguration_ === undefined)
- return Promise.resolve({ success: false });
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
if (this.claimedInterfaces_.has(interfaceNumber))
return Promise.resolve({ success: false });
@@ -178,9 +177,8 @@ function usbMocks(mojo) {
releaseInterface(interfaceNumber) {
assert_true(this.opened_);
-
- if (this.currentConfiguration_ === undefined)
- return Promise.resolve({ success: false });
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
if (this.claimedInterfaces_.has(interfaceNumber)) {
this.claimedInterfaces_.delete(interfaceNumber);
@@ -192,9 +190,8 @@ function usbMocks(mojo) {
setInterfaceAlternateSetting(interfaceNumber, alternateSetting) {
assert_true(this.opened_);
-
- if (this.currentConfiguration_ === undefined)
- return Promise.resolve({ success: false });
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
if (!this.claimedInterfaces_.has(interfaceNumber))
return Promise.resolve({ success: false });
@@ -220,12 +217,16 @@ function usbMocks(mojo) {
clearHalt(endpoint) {
assert_true(this.opened_);
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
// TODO(reillyg): Check that endpoint is valid.
return Promise.resolve({ success: true });
}
controlTransferIn(params, length, timeout) {
assert_true(this.opened_);
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
return Promise.resolve({
status: device.TransferStatus.OK,
data: [length >> 8, length & 0xff, params.request, params.value >> 8,
@@ -235,6 +236,8 @@ function usbMocks(mojo) {
controlTransferOut(params, data, timeout) {
assert_true(this.opened_);
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
return Promise.resolve({
status: device.TransferStatus.OK,
bytesWritten: data.byteLength
@@ -243,6 +246,8 @@ function usbMocks(mojo) {
genericTransferIn(endpointNumber, length, timeout) {
assert_true(this.opened_);
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
// TODO(reillyg): Check that endpoint is valid.
let data = new Array(length);
for (let i = 0; i < length; ++i)
@@ -255,6 +260,8 @@ function usbMocks(mojo) {
genericTransferOut(endpointNumber, data, timeout) {
assert_true(this.opened_);
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
// TODO(reillyg): Check that endpoint is valid.
return Promise.resolve({
status: device.TransferStatus.OK,
@@ -264,6 +271,8 @@ function usbMocks(mojo) {
isochronousTransferIn(endpointNumber, packetLengths, timeout) {
assert_true(this.opened_);
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
// TODO(reillyg): Check that endpoint is valid.
let data = new Array(packetLengths.reduce((a, b) => a + b, 0));
let dataOffset = 0;
@@ -282,6 +291,8 @@ function usbMocks(mojo) {
isochronousTransferOut(endpointNumber, data, packetLengths, timeout) {
assert_true(this.opened_);
+ assert_true(this.currentConfiguration_ !== undefined,
+ 'device configured');
// TODO(reillyg): Check that endpoint is valid.
let packets = new Array(packetLengths.length);
for (let i = 0; i < packetLengths.length; ++i) {
« no previous file with comments | « third_party/WebKit/LayoutTests/usb/resources/fake-devices.js ('k') | third_party/WebKit/LayoutTests/usb/usbDevice.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698