Update web-platform-tests to revision 2dda7b8c10c7566fa6167a32b09c85d51baf2a85

This commit is contained in:
WPT Sync Bot 2018-08-16 21:32:15 -04:00
parent 25ebde78aa
commit 8edc7686ef
129 changed files with 5280 additions and 820 deletions

View file

@ -1,273 +0,0 @@
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
'use strict';
(function() {
var mojomId = 'device/usb/public/mojom/chooser_service.mojom';
if (mojo.internal.isMojomLoaded(mojomId)) {
console.warn('The following mojom is loaded multiple times: ' + mojomId);
return;
}
mojo.internal.markMojomLoaded(mojomId);
var bindings = mojo;
var associatedBindings = mojo;
var codec = mojo.internal;
var validator = mojo.internal;
var exports = mojo.internal.exposeNamespace('device.mojom');
var device$ =
mojo.internal.exposeNamespace('device.mojom');
if (mojo.config.autoLoadMojomDeps) {
mojo.internal.loadMojomIfNecessary(
'device/usb/public/mojom/device.mojom', 'device.mojom.js');
}
var device_manager$ =
mojo.internal.exposeNamespace('device.mojom');
if (mojo.config.autoLoadMojomDeps) {
mojo.internal.loadMojomIfNecessary(
'device/usb/public/mojom/device_manager.mojom', 'device_manager.mojom.js');
}
function UsbChooserService_GetPermission_Params(values) {
this.initDefaults_();
this.initFields_(values);
}
UsbChooserService_GetPermission_Params.prototype.initDefaults_ = function() {
this.deviceFilters = null;
};
UsbChooserService_GetPermission_Params.prototype.initFields_ = function(fields) {
for(var field in fields) {
if (this.hasOwnProperty(field))
this[field] = fields[field];
}
};
UsbChooserService_GetPermission_Params.validate = function(messageValidator, offset) {
var err;
err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
if (err !== validator.validationError.NONE)
return err;
var kVersionSizes = [
{version: 0, numBytes: 16}
];
err = messageValidator.validateStructVersion(offset, kVersionSizes);
if (err !== validator.validationError.NONE)
return err;
// validate UsbChooserService_GetPermission_Params.deviceFilters
err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 8, new codec.PointerTo(device_manager$.UsbDeviceFilter), false, [0], 0);
if (err !== validator.validationError.NONE)
return err;
return validator.validationError.NONE;
};
UsbChooserService_GetPermission_Params.encodedSize = codec.kStructHeaderSize + 8;
UsbChooserService_GetPermission_Params.decode = function(decoder) {
var packed;
var val = new UsbChooserService_GetPermission_Params();
var numberOfBytes = decoder.readUint32();
var version = decoder.readUint32();
val.deviceFilters = decoder.decodeArrayPointer(new codec.PointerTo(device_manager$.UsbDeviceFilter));
return val;
};
UsbChooserService_GetPermission_Params.encode = function(encoder, val) {
var packed;
encoder.writeUint32(UsbChooserService_GetPermission_Params.encodedSize);
encoder.writeUint32(0);
encoder.encodeArrayPointer(new codec.PointerTo(device_manager$.UsbDeviceFilter), val.deviceFilters);
};
function UsbChooserService_GetPermission_ResponseParams(values) {
this.initDefaults_();
this.initFields_(values);
}
UsbChooserService_GetPermission_ResponseParams.prototype.initDefaults_ = function() {
this.result = null;
};
UsbChooserService_GetPermission_ResponseParams.prototype.initFields_ = function(fields) {
for(var field in fields) {
if (this.hasOwnProperty(field))
this[field] = fields[field];
}
};
UsbChooserService_GetPermission_ResponseParams.validate = function(messageValidator, offset) {
var err;
err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
if (err !== validator.validationError.NONE)
return err;
var kVersionSizes = [
{version: 0, numBytes: 16}
];
err = messageValidator.validateStructVersion(offset, kVersionSizes);
if (err !== validator.validationError.NONE)
return err;
// validate UsbChooserService_GetPermission_ResponseParams.result
err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, device$.UsbDeviceInfo, true);
if (err !== validator.validationError.NONE)
return err;
return validator.validationError.NONE;
};
UsbChooserService_GetPermission_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
UsbChooserService_GetPermission_ResponseParams.decode = function(decoder) {
var packed;
var val = new UsbChooserService_GetPermission_ResponseParams();
var numberOfBytes = decoder.readUint32();
var version = decoder.readUint32();
val.result = decoder.decodeStructPointer(device$.UsbDeviceInfo);
return val;
};
UsbChooserService_GetPermission_ResponseParams.encode = function(encoder, val) {
var packed;
encoder.writeUint32(UsbChooserService_GetPermission_ResponseParams.encodedSize);
encoder.writeUint32(0);
encoder.encodeStructPointer(device$.UsbDeviceInfo, val.result);
};
var kUsbChooserService_GetPermission_Name = 0;
function UsbChooserServicePtr(handleOrPtrInfo) {
this.ptr = new bindings.InterfacePtrController(UsbChooserService,
handleOrPtrInfo);
}
function UsbChooserServiceAssociatedPtr(associatedInterfacePtrInfo) {
this.ptr = new associatedBindings.AssociatedInterfacePtrController(
UsbChooserService, associatedInterfacePtrInfo);
}
UsbChooserServiceAssociatedPtr.prototype =
Object.create(UsbChooserServicePtr.prototype);
UsbChooserServiceAssociatedPtr.prototype.constructor =
UsbChooserServiceAssociatedPtr;
function UsbChooserServiceProxy(receiver) {
this.receiver_ = receiver;
}
UsbChooserServicePtr.prototype.getPermission = function() {
return UsbChooserServiceProxy.prototype.getPermission
.apply(this.ptr.getProxy(), arguments);
};
UsbChooserServiceProxy.prototype.getPermission = function(deviceFilters) {
var params = new UsbChooserService_GetPermission_Params();
params.deviceFilters = deviceFilters;
return new Promise(function(resolve, reject) {
var builder = new codec.MessageV1Builder(
kUsbChooserService_GetPermission_Name,
codec.align(UsbChooserService_GetPermission_Params.encodedSize),
codec.kMessageExpectsResponse, 0);
builder.encodeStruct(UsbChooserService_GetPermission_Params, params);
var message = builder.finish();
this.receiver_.acceptAndExpectResponse(message).then(function(message) {
var reader = new codec.MessageReader(message);
var responseParams =
reader.decodeStruct(UsbChooserService_GetPermission_ResponseParams);
resolve(responseParams);
}).catch(function(result) {
reject(Error("Connection error: " + result));
});
}.bind(this));
};
function UsbChooserServiceStub(delegate) {
this.delegate_ = delegate;
}
UsbChooserServiceStub.prototype.getPermission = function(deviceFilters) {
return this.delegate_ && this.delegate_.getPermission && this.delegate_.getPermission(deviceFilters);
}
UsbChooserServiceStub.prototype.accept = function(message) {
var reader = new codec.MessageReader(message);
switch (reader.messageName) {
default:
return false;
}
};
UsbChooserServiceStub.prototype.acceptWithResponder =
function(message, responder) {
var reader = new codec.MessageReader(message);
switch (reader.messageName) {
case kUsbChooserService_GetPermission_Name:
var params = reader.decodeStruct(UsbChooserService_GetPermission_Params);
this.getPermission(params.deviceFilters).then(function(response) {
var responseParams =
new UsbChooserService_GetPermission_ResponseParams();
responseParams.result = response.result;
var builder = new codec.MessageV1Builder(
kUsbChooserService_GetPermission_Name,
codec.align(UsbChooserService_GetPermission_ResponseParams.encodedSize),
codec.kMessageIsResponse, reader.requestID);
builder.encodeStruct(UsbChooserService_GetPermission_ResponseParams,
responseParams);
var message = builder.finish();
responder.accept(message);
});
return true;
default:
return false;
}
};
function validateUsbChooserServiceRequest(messageValidator) {
var message = messageValidator.message;
var paramsClass = null;
switch (message.getName()) {
case kUsbChooserService_GetPermission_Name:
if (message.expectsResponse())
paramsClass = UsbChooserService_GetPermission_Params;
break;
}
if (paramsClass === null)
return validator.validationError.NONE;
return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
}
function validateUsbChooserServiceResponse(messageValidator) {
var message = messageValidator.message;
var paramsClass = null;
switch (message.getName()) {
case kUsbChooserService_GetPermission_Name:
if (message.isResponse())
paramsClass = UsbChooserService_GetPermission_ResponseParams;
break;
}
if (paramsClass === null)
return validator.validationError.NONE;
return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
}
var UsbChooserService = {
name: 'device.mojom.UsbChooserService',
kVersion: 0,
ptrClass: UsbChooserServicePtr,
proxyClass: UsbChooserServiceProxy,
stubClass: UsbChooserServiceStub,
validateRequest: validateUsbChooserServiceRequest,
validateResponse: validateUsbChooserServiceResponse,
};
UsbChooserServiceStub.prototype.validator = validateUsbChooserServiceRequest;
UsbChooserServiceProxy.prototype.validator = validateUsbChooserServiceResponse;
exports.UsbChooserService = UsbChooserService;
exports.UsbChooserServicePtr = UsbChooserServicePtr;
exports.UsbChooserServiceAssociatedPtr = UsbChooserServiceAssociatedPtr;
})();

View file

@ -1 +0,0 @@
Content-Type: text/javascript; charset=utf-8

View file

@ -282,6 +282,166 @@
encoder.skip(1);
encoder.skip(1);
};
function WebUsbService_GetPermission_Params(values) {
this.initDefaults_();
this.initFields_(values);
}
WebUsbService_GetPermission_Params.prototype.initDefaults_ = function() {
this.deviceFilters = null;
};
WebUsbService_GetPermission_Params.prototype.initFields_ = function(fields) {
for(var field in fields) {
if (this.hasOwnProperty(field))
this[field] = fields[field];
}
};
WebUsbService_GetPermission_Params.generate = function(generator_) {
var generated = new WebUsbService_GetPermission_Params;
generated.deviceFilters = generator_.generateArray(function() {
return generator_.generateStruct(device.mojom.UsbDeviceFilter, false);
});
return generated;
};
WebUsbService_GetPermission_Params.prototype.mutate = function(mutator_) {
if (mutator_.chooseMutateField()) {
this.deviceFilters = mutator_.mutateArray(this.deviceFilters, function(val) {
return mutator_.mutateStruct(val, device.mojom.UsbDeviceFilter, false);
});
}
return this;
};
WebUsbService_GetPermission_Params.prototype.getHandleDeps = function() {
var handles = [];
return handles;
};
WebUsbService_GetPermission_Params.prototype.setHandles = function() {
this.setHandlesInternal_(arguments, 0);
};
WebUsbService_GetPermission_Params.prototype.setHandlesInternal_ = function(handles, idx) {
return idx;
};
WebUsbService_GetPermission_Params.validate = function(messageValidator, offset) {
var err;
err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
if (err !== validator.validationError.NONE)
return err;
var kVersionSizes = [
{version: 0, numBytes: 16}
];
err = messageValidator.validateStructVersion(offset, kVersionSizes);
if (err !== validator.validationError.NONE)
return err;
// validate WebUsbService_GetPermission_Params.deviceFilters
err = messageValidator.validateArrayPointer(offset + codec.kStructHeaderSize + 0, 8, new codec.PointerTo(device_manager$.UsbDeviceFilter), false, [0], 0);
if (err !== validator.validationError.NONE)
return err;
return validator.validationError.NONE;
};
WebUsbService_GetPermission_Params.encodedSize = codec.kStructHeaderSize + 8;
WebUsbService_GetPermission_Params.decode = function(decoder) {
var packed;
var val = new WebUsbService_GetPermission_Params();
var numberOfBytes = decoder.readUint32();
var version = decoder.readUint32();
val.deviceFilters = decoder.decodeArrayPointer(new codec.PointerTo(device_manager$.UsbDeviceFilter));
return val;
};
WebUsbService_GetPermission_Params.encode = function(encoder, val) {
var packed;
encoder.writeUint32(WebUsbService_GetPermission_Params.encodedSize);
encoder.writeUint32(0);
encoder.encodeArrayPointer(new codec.PointerTo(device_manager$.UsbDeviceFilter), val.deviceFilters);
};
function WebUsbService_GetPermission_ResponseParams(values) {
this.initDefaults_();
this.initFields_(values);
}
WebUsbService_GetPermission_ResponseParams.prototype.initDefaults_ = function() {
this.result = null;
};
WebUsbService_GetPermission_ResponseParams.prototype.initFields_ = function(fields) {
for(var field in fields) {
if (this.hasOwnProperty(field))
this[field] = fields[field];
}
};
WebUsbService_GetPermission_ResponseParams.generate = function(generator_) {
var generated = new WebUsbService_GetPermission_ResponseParams;
generated.result = generator_.generateStruct(device.mojom.UsbDeviceInfo, true);
return generated;
};
WebUsbService_GetPermission_ResponseParams.prototype.mutate = function(mutator_) {
if (mutator_.chooseMutateField()) {
this.result = mutator_.mutateStruct(this.result, device.mojom.UsbDeviceInfo, true);
}
return this;
};
WebUsbService_GetPermission_ResponseParams.prototype.getHandleDeps = function() {
var handles = [];
return handles;
};
WebUsbService_GetPermission_ResponseParams.prototype.setHandles = function() {
this.setHandlesInternal_(arguments, 0);
};
WebUsbService_GetPermission_ResponseParams.prototype.setHandlesInternal_ = function(handles, idx) {
return idx;
};
WebUsbService_GetPermission_ResponseParams.validate = function(messageValidator, offset) {
var err;
err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
if (err !== validator.validationError.NONE)
return err;
var kVersionSizes = [
{version: 0, numBytes: 16}
];
err = messageValidator.validateStructVersion(offset, kVersionSizes);
if (err !== validator.validationError.NONE)
return err;
// validate WebUsbService_GetPermission_ResponseParams.result
err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, device$.UsbDeviceInfo, true);
if (err !== validator.validationError.NONE)
return err;
return validator.validationError.NONE;
};
WebUsbService_GetPermission_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
WebUsbService_GetPermission_ResponseParams.decode = function(decoder) {
var packed;
var val = new WebUsbService_GetPermission_ResponseParams();
var numberOfBytes = decoder.readUint32();
var version = decoder.readUint32();
val.result = decoder.decodeStructPointer(device$.UsbDeviceInfo);
return val;
};
WebUsbService_GetPermission_ResponseParams.encode = function(encoder, val) {
var packed;
encoder.writeUint32(WebUsbService_GetPermission_ResponseParams.encodedSize);
encoder.writeUint32(0);
encoder.encodeStructPointer(device$.UsbDeviceInfo, val.result);
};
function WebUsbService_SetClient_Params(values) {
this.initDefaults_();
this.initFields_(values);
@ -366,7 +526,8 @@
};
var kWebUsbService_GetDevices_Name = 0;
var kWebUsbService_GetDevice_Name = 1;
var kWebUsbService_SetClient_Name = 2;
var kWebUsbService_GetPermission_Name = 2;
var kWebUsbService_SetClient_Name = 3;
function WebUsbServicePtr(handleOrPtrInfo) {
this.ptr = new bindings.InterfacePtrController(WebUsbService,
@ -426,6 +587,31 @@
var message = builder.finish();
this.receiver_.accept(message);
};
WebUsbServicePtr.prototype.getPermission = function() {
return WebUsbServiceProxy.prototype.getPermission
.apply(this.ptr.getProxy(), arguments);
};
WebUsbServiceProxy.prototype.getPermission = function(deviceFilters) {
var params_ = new WebUsbService_GetPermission_Params();
params_.deviceFilters = deviceFilters;
return new Promise(function(resolve, reject) {
var builder = new codec.MessageV1Builder(
kWebUsbService_GetPermission_Name,
codec.align(WebUsbService_GetPermission_Params.encodedSize),
codec.kMessageExpectsResponse, 0);
builder.encodeStruct(WebUsbService_GetPermission_Params, params_);
var message = builder.finish();
this.receiver_.acceptAndExpectResponse(message).then(function(message) {
var reader = new codec.MessageReader(message);
var responseParams =
reader.decodeStruct(WebUsbService_GetPermission_ResponseParams);
resolve(responseParams);
}).catch(function(result) {
reject(Error("Connection error: " + result));
});
}.bind(this));
};
WebUsbServicePtr.prototype.setClient = function() {
return WebUsbServiceProxy.prototype.setClient
.apply(this.ptr.getProxy(), arguments);
@ -451,6 +637,9 @@
WebUsbServiceStub.prototype.getDevice = function(guid, deviceRequestd) {
return this.delegate_ && this.delegate_.getDevice && this.delegate_.getDevice(guid, deviceRequestd);
}
WebUsbServiceStub.prototype.getPermission = function(deviceFilters) {
return this.delegate_ && this.delegate_.getPermission && this.delegate_.getPermission(deviceFilters);
}
WebUsbServiceStub.prototype.setClient = function(client) {
return this.delegate_ && this.delegate_.setClient && this.delegate_.setClient(client);
}
@ -491,6 +680,22 @@
responder.accept(message);
});
return true;
case kWebUsbService_GetPermission_Name:
var params = reader.decodeStruct(WebUsbService_GetPermission_Params);
this.getPermission(params.deviceFilters).then(function(response) {
var responseParams =
new WebUsbService_GetPermission_ResponseParams();
responseParams.result = response.result;
var builder = new codec.MessageV1Builder(
kWebUsbService_GetPermission_Name,
codec.align(WebUsbService_GetPermission_ResponseParams.encodedSize),
codec.kMessageIsResponse, reader.requestID);
builder.encodeStruct(WebUsbService_GetPermission_ResponseParams,
responseParams);
var message = builder.finish();
responder.accept(message);
});
return true;
default:
return false;
}
@ -508,6 +713,10 @@
if (!message.expectsResponse() && !message.isResponse())
paramsClass = WebUsbService_GetDevice_Params;
break;
case kWebUsbService_GetPermission_Name:
if (message.expectsResponse())
paramsClass = WebUsbService_GetPermission_Params;
break;
case kWebUsbService_SetClient_Name:
if (!message.expectsResponse() && !message.isResponse())
paramsClass = WebUsbService_SetClient_Params;
@ -526,6 +735,10 @@
if (message.isResponse())
paramsClass = WebUsbService_GetDevices_ResponseParams;
break;
case kWebUsbService_GetPermission_Name:
if (message.isResponse())
paramsClass = WebUsbService_GetPermission_ResponseParams;
break;
}
if (paramsClass === null)
return validator.validationError.NONE;
@ -548,6 +761,9 @@
getDevice: {
params: WebUsbService_GetDevice_Params,
},
getPermission: {
params: WebUsbService_GetPermission_Params,
},
setClient: {
params: WebUsbService_SetClient_Params,
},

View file

@ -13,10 +13,6 @@ let internal = {
webUsbService: null,
webUsbServiceInterceptor: null,
webUsbServiceCrossFrameProxy: null,
chooser: null,
chooserInterceptor: null,
chooserCrossFrameProxy: null,
};
// Converts an ECMAScript String object to an instance of
@ -376,6 +372,17 @@ class FakeWebUsbService {
}
}
getPermission(deviceFilters) {
return new Promise(resolve => {
if (navigator.usb.test.onrequestdevice) {
navigator.usb.test.onrequestdevice(
new USBDeviceRequestEvent(deviceFilters, resolve));
} else {
resolve({ result: null });
}
});
}
setClient(client) {
this.client_ = client;
}
@ -403,27 +410,6 @@ class USBDeviceRequestEvent {
}
}
class FakeChooserService {
constructor() {
this.bindingSet_ = new mojo.BindingSet(device.mojom.UsbChooserService);
}
addBinding(handle) {
this.bindingSet_.addBinding(this, handle);
}
getPermission(deviceFilters) {
return new Promise(resolve => {
if (navigator.usb.test.onrequestdevice) {
navigator.usb.test.onrequestdevice(
new USBDeviceRequestEvent(deviceFilters, resolve));
} else {
resolve({ result: null });
}
});
}
}
// Unlike FakeDevice this class is exported to callers of USBTest.addFakeDevice.
class FakeUSBDevice {
constructor() {
@ -472,15 +458,6 @@ class USBTest {
internal.webUsbServiceCrossFrameProxy = new CrossFrameHandleProxy(
handle => internal.webUsbService.addBinding(handle));
internal.chooser = new FakeChooserService();
internal.chooserInterceptor =
new MojoInterfaceInterceptor(device.mojom.UsbChooserService.name);
internal.chooserInterceptor.oninterfacerequest =
e => internal.chooser.addBinding(e.handle);
internal.chooserInterceptor.start();
internal.chooserCrossFrameProxy = new CrossFrameHandleProxy(
handle => internal.chooser.addBinding(handle));
// Wait for a call to GetDevices() to pass between the renderer and the
// mock in order to establish that everything is set up.
await navigator.usb.getDevices();
@ -498,13 +475,6 @@ class USBTest {
e => internal.webUsbServiceCrossFrameProxy.forwardHandle(e.handle);
otherWindow.webUsbServiceInterceptor.start();
otherWindow.chooserInterceptor =
new otherWindow.MojoInterfaceInterceptor(
device.mojom.UsbChooserService.name);
otherWindow.chooserInterceptor.oninterfacerequest =
e => internal.chooserCrossFrameProxy.forwardHandle(e.handle);
otherWindow.chooserInterceptor.start();
// Wait for a call to GetDevices() to pass between the renderer and the
// mock in order to establish that everything is set up.
await otherWindow.navigator.usb.getDevices();