bluetooth: Implement acceptAllDevices

third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp

 // Copyright 2015 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.
 
 #include "modules/bluetooth/Bluetooth.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
@@ skipping 84 matching lines @@
           "'namePrefix', if present, must me non-empty.");
       return;
     }
     canonicalizedFilter.namePrefix = filter.namePrefix();
   }
 }
 
 static void convertRequestDeviceOptions(const RequestDeviceOptions& options,
                                         WebRequestDeviceOptions& result,
                                         ExceptionState& exceptionState) {
-  ASSERT(options.hasFilters());
+  result.acceptAllDevices = options.acceptAllDevices();

[ortuno, 2016/10/31 00:00:02]

In order to debug the spec and make the implementation easier to follow, I like
to follow the spec as closely as possible. For this reason could you implement
the logic as is in Step 1 of
https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetooth-requestdevice and
make sure each of the paths is properly tested?

if (options.hasFilters() && options.acceptAllDevices()) {
  // reject with TypeError.
  return;
}

if (!options.hasFilters() && !options.acceptAllDevices()) {
  // reject with TypeError.
  return;
}

if (options.hasFilters() && options.filters.isEmpty()) {
  // reject with TypeError.
  return;
}

result.hasFilters = options.hasFilters();
if (options.hasFilters()) {
  Vector<WebBluetoothScanFilter> filters;
  // ...
}

...

+  if (!result.acceptAllDevices) {
+    if (!options.hasFilters() || options.filters().isEmpty()) {
+      exceptionState.throwTypeError(
+          "'filters' member must be non-empty to find any devices when "
+          "'acceptAllDevices' is false.");
+      return;
+    }
 
-  if (options.filters().isEmpty()) {
-    exceptionState.throwTypeError(
-        "'filters' member must be non-empty to find any devices.");
+    Vector<WebBluetoothScanFilter> filters;
+    for (const BluetoothScanFilter& filter : options.filters()) {
+      WebBluetoothScanFilter canonicalizedFilter = WebBluetoothScanFilter();
+
+      canonicalizeFilter(filter, canonicalizedFilter, exceptionState);
+
+      if (exceptionState.hadException())
+        return;
+
+      filters.append(canonicalizedFilter);
+    }
+
+    result.filters.assign(filters);
   }
 
-  Vector<WebBluetoothScanFilter> filters;
-  for (const BluetoothScanFilter& filter : options.filters()) {
-    WebBluetoothScanFilter canonicalizedFilter = WebBluetoothScanFilter();
-
-    canonicalizeFilter(filter, canonicalizedFilter, exceptionState);
-
-    if (exceptionState.hadException())
-      return;
-
-    filters.append(canonicalizedFilter);
-  }
-
-  result.filters.assign(filters);
-
   if (options.hasOptionalServices()) {
     Vector<WebString> optionalServices;
     for (const StringOrUnsignedLong& optionalService :
          options.optionalServices()) {
       const String& validatedOptionalService =
           BluetoothUUID::getService(optionalService, exceptionState);
       if (exceptionState.hadException())
         return;
       optionalServices.append(validatedOptionalService);
     }
@@ skipping 74 matching lines @@
   // Subsequent steps are handled in the browser process.
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
   webbluetooth->requestDevice(
       webOptions,
       new CallbackPromiseAdapter<BluetoothDevice, BluetoothError>(resolver));
   return promise;
 }
 
 }  // namespace blink