Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2338)

Unified Diff: third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp

Issue 2642123003: Bluetooth: Make maximum possible name filter 248 bytes, not 240 (Closed)
Patch Set: Change all NotFoundErrors to TypeErrors Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp
diff --git a/third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp b/third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp
index 5174625e83020f66eeb6ae1d540ecec81c0c59ce..3f2e4facc29754a195ede0d69eb678b008c37e46 100644
--- a/third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/Bluetooth.cpp
@@ -25,14 +25,6 @@
namespace blink {
namespace {
-// A name coming from an adv packet is max 29 bytes (adv packet max size
-// 31 bytes - 2 byte length field), but the name can also be acquired via
-// gap.device_name, so it is limited to the max EIR packet size of 240 bytes.
-// See Core Spec 5.0, vol 3, C, 8.1.2.
-const size_t kMaxFilterNameLength = 240;
-const char kFilterNameTooLong[] =
- "A 'name' or 'namePrefix' longer than 240 bytes results in no devices "
- "being found, because a device can't acquire a name longer than 240 bytes.";
// Per the Bluetooth Spec: The name is a user-friendly name associated with the
// device and consists of a maximum of 248 bytes coded according to the UTF-8
// standard.
@@ -73,10 +65,6 @@ static void canonicalizeFilter(
exceptionState.throwTypeError(kDeviceNameTooLong);
return;
}
- if (nameLength > kMaxFilterNameLength) {
- exceptionState.throwDOMException(NotFoundError, kFilterNameTooLong);
- return;
- }
canonicalizedFilter->name = filter.name();
}
@@ -86,10 +74,6 @@ static void canonicalizeFilter(
exceptionState.throwTypeError(kDeviceNameTooLong);
return;
}
- if (namePrefixLength > kMaxFilterNameLength) {
- exceptionState.throwDOMException(NotFoundError, kFilterNameTooLong);
- return;
- }
if (filter.namePrefix().length() == 0) {
exceptionState.throwTypeError(
"'namePrefix', if present, must me non-empty.");

Powered by Google App Engine
This is Rietveld 408576698