Bug 1467661 [wpt PR 11393] - Revert #9854, a=testonly
☠☠ backed out by 45cfaa4b4c0c ☠ ☠
authorLuke Bjerring <lukebjerring@users.noreply.github.com>
Tue, 26 Jun 2018 02:47:45 +0000
changeset 424066 324874fd667ea997f565296586c07306241d25ca
parent 424065 42bbb9d89d1edfa8db2efc52fdade9270a649fd1
child 424067 cadbab26c4c030bd4fc41ab2ab99cb4a9d9da069
push id104729
push userjames@hoppipolla.co.uk
push dateWed, 27 Jun 2018 23:29:57 +0000
treeherdermozilla-inbound@7c351d6f780f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1467661, 11393
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1467661 [wpt PR 11393] - Revert #9854, a=testonly Automatic update from web-platform-testsRevert #9854 (#11393) -- wpt-commits: 6e066fd7f0c731b7718cf48b1653abb950f70684 wpt-pr: 11393
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/interfaces/webusb.idl
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -588471,17 +588471,17 @@
    "d466ddd18ed621e15cc416863502069ffccfa5b9",
    "support"
   ],
   "interfaces/webrtc-pc.idl": [
    "a631e2e0ea0f451c64b5d5f74fe7cbeafc231b8e",
    "support"
   ],
   "interfaces/webusb.idl": [
-   "1567268ad97c23f6709c835ba5d272c0982c0a59",
+   "e609a866d40f70f59f682a1a5ec82cf713863969",
    "support"
   ],
   "interfaces/webvtt.idl": [
    "3e7ab31795b8339de3d6904f0d68dab68ca24148",
    "support"
   ],
   "interfaces/webxr.idl": [
    "b1bbaa67765ce6eb20c39e6f2234912e4853e148",
--- a/testing/web-platform/tests/interfaces/webusb.idl
+++ b/testing/web-platform/tests/interfaces/webusb.idl
@@ -1,57 +1,55 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content of this file was automatically extracted from the
-// "WebUSB API" spec.
-// See: https://wicg.github.io/webusb/
+// Copied from https://wicg.github.io/webusb/#idl-index minus the
+// definitions related to Permissions API integration which is unstable.
 
 dictionary USBDeviceFilter {
   unsigned short vendorId;
   unsigned short productId;
   octet classCode;
   octet subclassCode;
   octet protocolCode;
   DOMString serialNumber;
 };
 
 dictionary USBDeviceRequestOptions {
   required sequence<USBDeviceFilter> filters;
 };
 
-[Exposed=(DedicatedWorker,SharedWorker,Window), SecureContext]
+[Exposed=(DedicatedWorker, SharedWorker, Window), SecureContext]
 interface USB : EventTarget {
   attribute EventHandler onconnect;
   attribute EventHandler ondisconnect;
   Promise<sequence<USBDevice>> getDevices();
   [Exposed=Window] Promise<USBDevice> requestDevice(USBDeviceRequestOptions options);
 };
 
 [Exposed=Window, SecureContext]
 partial interface Navigator {
   [SameObject] readonly attribute USB usb;
 };
 
-[Exposed=(DedicatedWorker,SharedWorker), SecureContext]
+[Exposed=(DedicatedWorker, SharedWorker), SecureContext]
 partial interface WorkerNavigator {
   [SameObject] readonly attribute USB usb;
 };
 
 dictionary USBConnectionEventInit : EventInit {
     required USBDevice device;
 };
 
 [
   Constructor(DOMString type, USBConnectionEventInit eventInitDict),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBConnectionEvent : Event {
   [SameObject] readonly attribute USBDevice device;
 };
 
-[Exposed=(DedicatedWorker,SharedWorker,Window)]
+[Exposed=(DedicatedWorker, SharedWorker, Window)]
 interface USBDevice {
   readonly attribute octet usbVersionMajor;
   readonly attribute octet usbVersionMinor;
   readonly attribute octet usbVersionSubminor;
   readonly attribute octet deviceClass;
   readonly attribute octet deviceSubclass;
   readonly attribute octet deviceProtocol;
   readonly attribute unsigned short vendorId;
@@ -105,91 +103,91 @@ dictionary USBControlTransferParameters 
   required USBRecipient recipient;
   required octet request;
   required unsigned short value;
   required unsigned short index;
 };
 
 [
   Constructor(USBTransferStatus status, optional DataView? data),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBInTransferResult {
   readonly attribute DataView? data;
   readonly attribute USBTransferStatus status;
 };
 
 [
   Constructor(USBTransferStatus status, optional unsigned long bytesWritten = 0),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBOutTransferResult {
   readonly attribute unsigned long bytesWritten;
   readonly attribute USBTransferStatus status;
 };
 
 [
   Constructor(USBTransferStatus status, optional DataView? data),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBIsochronousInTransferPacket {
   readonly attribute DataView? data;
   readonly attribute USBTransferStatus status;
 };
 
 [
   Constructor(sequence<USBIsochronousInTransferPacket> packets, optional DataView? data),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBIsochronousInTransferResult {
   readonly attribute DataView? data;
   readonly attribute FrozenArray<USBIsochronousInTransferPacket> packets;
 };
 
 [
   Constructor(USBTransferStatus status, optional unsigned long bytesWritten = 0),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBIsochronousOutTransferPacket {
   readonly attribute unsigned long bytesWritten;
   readonly attribute USBTransferStatus status;
 };
 
 [
   Constructor(sequence<USBIsochronousOutTransferPacket> packets),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBIsochronousOutTransferResult {
   readonly attribute FrozenArray<USBIsochronousOutTransferPacket> packets;
 };
 
 [
   Constructor(USBDevice device, octet configurationValue),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBConfiguration {
   readonly attribute octet configurationValue;
   readonly attribute DOMString? configurationName;
   readonly attribute FrozenArray<USBInterface> interfaces;
 };
 
 [
   Constructor(USBConfiguration configuration, octet interfaceNumber),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBInterface {
   readonly attribute octet interfaceNumber;
   readonly attribute USBAlternateInterface alternate;
   readonly attribute FrozenArray<USBAlternateInterface> alternates;
   readonly attribute boolean claimed;
 };
 
 [
   Constructor(USBInterface deviceInterface, octet alternateSetting),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBAlternateInterface {
   readonly attribute octet alternateSetting;
   readonly attribute octet interfaceClass;
   readonly attribute octet interfaceSubclass;
   readonly attribute octet interfaceProtocol;
   readonly attribute DOMString? interfaceName;
   readonly attribute FrozenArray<USBEndpoint> endpoints;
@@ -203,34 +201,16 @@ enum USBDirection {
 enum USBEndpointType {
   "bulk",
   "interrupt",
   "isochronous"
 };
 
 [
   Constructor(USBAlternateInterface alternate, octet endpointNumber, USBDirection direction),
-  Exposed=(DedicatedWorker,SharedWorker,Window)
+  Exposed=(DedicatedWorker, SharedWorker, Window)
 ]
 interface USBEndpoint {
   readonly attribute octet endpointNumber;
   readonly attribute USBDirection direction;
   readonly attribute USBEndpointType type;
   readonly attribute unsigned long packetSize;
 };
-
-dictionary USBPermissionDescriptor : PermissionDescriptor {
-  sequence<USBDeviceFilter> filters;
-};
-
-dictionary AllowedUSBDevice {
-  required octet vendorId;
-  required octet productId;
-  DOMString serialNumber;
-};
-
-dictionary USBPermissionStorage {
-  sequence<AllowedUSBDevice> allowedDevices = [];
-};
-
-interface USBPermissionResult : PermissionStatus {
-  attribute FrozenArray<USBDevice> devices;
-};