Auto merge of #20591 - servo:bluetooth, r=emilio

Fix /_mozilla/bluetooth/interfaces.html

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20591)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-04-09 04:29:15 -04:00 committed by GitHub
commit 5d6db35854
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 40 deletions

View file

@ -59461,7 +59461,7 @@
"testharness"
],
"bluetooth/interfaces.html": [
"4d97da8dc427bd500dafd684e08da59a9a0d35c4",
"4558862f81e4a5a3a3d16f7156c5cff63f4b7073",
"testharness"
],
"bluetooth/readValue/characteristic/blocklisted-characteristic.html": [
@ -61533,7 +61533,7 @@
"support"
],
"css/get-computed-style-for-url.html": [
"2e90c0abd6c83bb11113f39a557a4c1c1c24364b",
"cb3b467160026d20c4e283c12ded20fe2d025f88",
"testharness"
],
"css/green.png": [

View file

@ -1,11 +1,5 @@
[interfaces.html]
type: testharness
[Bluetooth interface: existence and properties of interface object]
expected: FAIL
[Bluetooth interface: existence and properties of interface prototype object]
expected: FAIL
[Bluetooth interface: operation getAvailability()]
expected: FAIL
@ -48,12 +42,6 @@
[Bluetooth interface: window.navigator.bluetooth must inherit property "onserviceremoved" with the proper type (8)]
expected: FAIL
[BluetoothPermissionResult interface: existence and properties of interface object]
expected: FAIL
[BluetoothPermissionResult interface: existence and properties of interface prototype object]
expected: FAIL
[BluetoothPermissionResult interface: attribute devices]
expected: FAIL
@ -75,12 +63,6 @@
[ValueEvent interface: attribute value]
expected: FAIL
[BluetoothDevice interface: existence and properties of interface object]
expected: FAIL
[BluetoothDevice interface: existence and properties of interface prototype object]
expected: FAIL
[BluetoothDevice interface: operation watchAdvertisements()]
expected: FAIL
@ -144,12 +126,6 @@
[BluetoothRemoteGATTServer interface: operation getPrimaryServices(BluetoothServiceUUID)]
expected: FAIL
[BluetoothRemoteGATTService interface: existence and properties of interface object]
expected: FAIL
[BluetoothRemoteGATTService interface: existence and properties of interface prototype object]
expected: FAIL
[BluetoothRemoteGATTService interface: operation getCharacteristic(BluetoothCharacteristicUUID)]
expected: FAIL
@ -165,12 +141,6 @@
[BluetoothRemoteGATTService interface: attribute oncharacteristicvaluechanged]
expected: FAIL
[BluetoothRemoteGATTCharacteristic interface: existence and properties of interface object]
expected: FAIL
[BluetoothRemoteGATTCharacteristic interface: existence and properties of interface prototype object]
expected: FAIL
[BluetoothRemoteGATTCharacteristic interface: operation getDescriptor(BluetoothDescriptorUUID)]
expected: FAIL

View file

@ -27,6 +27,18 @@
interface ArrayBufferView {
};
dictionary PermissionDescriptor {
required PermissionName name;
};
interface PermissionStatus {
};
dictionary EventInit {
boolean bubbles = false;
boolean cancelable = false;
};
</script>
<script id='webbluetooth_idl' type="text/plain">
dictionary BluetoothDataFilterInit {
@ -49,7 +61,7 @@ dictionary RequestDeviceOptions {
boolean acceptAllDevices = false;
};
interface Bluetooth {
interface Bluetooth : EventTarget {
[SecureContext]
Promise<boolean> getAvailability();
[SecureContext]
@ -59,7 +71,6 @@ interface Bluetooth {
[SecureContext]
Promise<BluetoothDevice> requestDevice(optional RequestDeviceOptions options);
};
Bluetooth implements EventTarget;
Bluetooth implements BluetoothDeviceEventHandlers;
Bluetooth implements CharacteristicEventHandlers;
Bluetooth implements ServiceEventHandlers;
@ -95,7 +106,7 @@ dictionary ValueEventInit : EventInit {
any value = null;
};
interface BluetoothDevice {
interface BluetoothDevice : EventTarget {
readonly attribute DOMString id;
readonly attribute DOMString? name;
readonly attribute BluetoothRemoteGATTServer? gatt;
@ -104,7 +115,6 @@ interface BluetoothDevice {
void unwatchAdvertisements();
readonly attribute boolean watchingAdvertisements;
};
BluetoothDevice implements EventTarget;
BluetoothDevice implements BluetoothDeviceEventHandlers;
BluetoothDevice implements CharacteristicEventHandlers;
BluetoothDevice implements ServiceEventHandlers;
@ -147,7 +157,7 @@ interface BluetoothRemoteGATTServer {
getPrimaryServices(optional BluetoothServiceUUID service);
};
interface BluetoothRemoteGATTService {
interface BluetoothRemoteGATTService : EventTarget {
readonly attribute BluetoothDevice device;
readonly attribute UUID uuid;
readonly attribute boolean isPrimary;
@ -160,11 +170,10 @@ interface BluetoothRemoteGATTService {
Promise<sequence<BluetoothRemoteGATTService>>
getIncludedServices(optional BluetoothServiceUUID service);
};
BluetoothRemoteGATTService implements EventTarget;
BluetoothRemoteGATTService implements CharacteristicEventHandlers;
BluetoothRemoteGATTService implements ServiceEventHandlers;
interface BluetoothRemoteGATTCharacteristic {
interface BluetoothRemoteGATTCharacteristic : EventTarget {
readonly attribute BluetoothRemoteGATTService service;
readonly attribute UUID uuid;
readonly attribute BluetoothCharacteristicProperties properties;
@ -177,7 +186,6 @@ interface BluetoothRemoteGATTCharacteristic {
Promise<BluetoothRemoteGATTCharacteristic> startNotifications();
Promise<BluetoothRemoteGATTCharacteristic> stopNotifications();
};
BluetoothRemoteGATTCharacteristic implements EventTarget;
BluetoothRemoteGATTCharacteristic implements CharacteristicEventHandlers;
interface BluetoothCharacteristicProperties {