From 30f924d8f6f63a5c3b462f39482cdccd4800f5d8 Mon Sep 17 00:00:00 2001
From: Zakor Gyula <zakorgy@inf.u-szeged.hu>
Date: Mon, 14 Nov 2016 11:15:13 +0100
Subject: [PATCH 1/4] Fix a typo in dom/bluetooth.rs

---
 components/script/dom/bluetooth.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs
index 0a6634f35dc..6984a50f2a4 100644
--- a/components/script/dom/bluetooth.rs
+++ b/components/script/dom/bluetooth.rs
@@ -194,7 +194,7 @@ fn convert_request_device_options(filters: &Option<Vec<BluetoothRequestDeviceFil
 
             // Step 2.7.
             // Note: What we are doing here is adding the not blacklisted UUIDs to the result vector,
-            // insted of removing them from an already filled vector.
+            // instead of removing them from an already filled vector.
             if !uuid_is_blacklisted(uuid.as_ref(), Blacklist::All) {
                 optional_services_uuids.push(uuid);
             }

From dd4b0cf6206a3c442ad7c3f268106a4b5fb8b4f2 Mon Sep 17 00:00:00 2001
From: Zakor Gyula <zakorgy@inf.u-szeged.hu>
Date: Mon, 14 Nov 2016 11:19:26 +0100
Subject: [PATCH 2/4] Simplify RequestDevice function in bluetooth.rs

---
 components/script/dom/bluetooth.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs
index 6984a50f2a4..6125680d637 100644
--- a/components/script/dom/bluetooth.rs
+++ b/components/script/dom/bluetooth.rs
@@ -337,11 +337,7 @@ impl BluetoothMethods for Bluetooth {
             return p;
         }
         // Step 2.
-        if !option.acceptAllDevices {
-            self.request_bluetooth_devices(&p, &option.filters, &option.optionalServices);
-        } else {
-            self.request_bluetooth_devices(&p, &None, &option.optionalServices);
-        }
+        self.request_bluetooth_devices(&p, &option.filters, &option.optionalServices);
         // TODO(#4282): Step 3-5: Reject and resolve promise.
         return p;
     }

From 997f9f67f0fbb9bdf875dc44e063a31b92cdc269 Mon Sep 17 00:00:00 2001
From: zakorgyula <gyula.zakor@gmail.com>
Date: Thu, 27 Oct 2016 16:16:18 +0200
Subject: [PATCH 3/4] Updating bluetooth in Navigator.webidl

---
 components/script/dom/webidls/Navigator.webidl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/script/dom/webidls/Navigator.webidl b/components/script/dom/webidls/Navigator.webidl
index 0f32e3bdf1e..84d5a7c3ccb 100644
--- a/components/script/dom/webidls/Navigator.webidl
+++ b/components/script/dom/webidls/Navigator.webidl
@@ -7,7 +7,6 @@ interface Navigator {
   // objects implementing this interface also implement the interfaces given below
 };
 Navigator implements NavigatorID;
-Navigator implements NavigatorBluetooth;
 Navigator implements NavigatorLanguage;
 //Navigator implements NavigatorOnLine;
 //Navigator implements NavigatorContentUtils;
@@ -27,9 +26,9 @@ interface NavigatorID {
   readonly attribute DOMString userAgent;
 };
 
-[NoInterfaceObject]
-interface NavigatorBluetooth {
-    readonly attribute Bluetooth bluetooth;
+// https://webbluetoothcg.github.io/web-bluetooth/#navigator-extensions
+partial interface Navigator {
+  readonly attribute Bluetooth bluetooth;
 };
 
 // https://w3c.github.io/ServiceWorker/#navigator-service-worker

From 83681a13a11928346b346f6189a2a71bd3f3db33 Mon Sep 17 00:00:00 2001
From: Zakor Gyula <zakorgy@inf.u-szeged.hu>
Date: Mon, 14 Nov 2016 11:09:07 +0100
Subject: [PATCH 4/4] Correcting bluetooth flag strings

---
 components/bluetooth/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/bluetooth/lib.rs b/components/bluetooth/lib.rs
index 1534a6db671..de5ca6a5b33 100644
--- a/components/bluetooth/lib.rs
+++ b/components/bluetooth/lib.rs
@@ -465,13 +465,13 @@ impl BluetoothManager {
             match flag.as_ref() {
                 "broadcast" => props.insert(BROADCAST),
                 "read" => props.insert(READ),
-                "write_without_response" => props.insert(WRITE_WITHOUT_RESPONSE),
+                "write-without-response" => props.insert(WRITE_WITHOUT_RESPONSE),
                 "write" => props.insert(WRITE),
                 "notify" => props.insert(NOTIFY),
                 "indicate" => props.insert(INDICATE),
-                "authenticated_signed_writes" => props.insert(AUTHENTICATED_SIGNED_WRITES),
-                "reliable_write" => props.insert(RELIABLE_WRITE),
-                "writable_auxiliaries" => props.insert(WRITABLE_AUXILIARIES),
+                "authenticated-signed-writes" => props.insert(AUTHENTICATED_SIGNED_WRITES),
+                "reliable-write" => props.insert(RELIABLE_WRITE),
+                "writable-auxiliaries" => props.insert(WRITABLE_AUXILIARIES),
                 _ => (),
             }
         }