| Index: third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
|
| diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
|
| index 383649d5fa405a3c9da61f73c70abbcee2f0525a..b2fd07d3e91a46796fc5a5e1cbf05317a1989431 100644
|
| --- a/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
|
| +++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp
|
| @@ -9,15 +9,25 @@
|
|
|
| namespace blink {
|
|
|
| -DOMException* BluetoothError::take(ScriptPromiseResolver*,
|
| +DOMException* BluetoothError::take(ScriptPromiseResolver* resolver,
|
| mojom::blink::WebBluetoothResult error) {
|
| + return take(resolver, error, String());
|
| +}
|
| +
|
| +DOMException* BluetoothError::take(ScriptPromiseResolver* resolver,
|
| + mojom::blink::WebBluetoothResult error,
|
| + String detailedMessage) {
|
| switch (error) {
|
| case mojom::blink::WebBluetoothResult::SUCCESS:
|
| ASSERT_NOT_REACHED();
|
| return DOMException::create(UnknownError);
|
| -#define MAP_ERROR(enumeration, name, message) \
|
| - case mojom::blink::WebBluetoothResult::enumeration: \
|
| - return DOMException::create(name, message)
|
| +#define MAP_ERROR(enumeration, name, message) \
|
| + case mojom::blink::WebBluetoothResult::enumeration: \
|
| + if (detailedMessage.isEmpty()) { \
|
| + return DOMException::create(name, message); \
|
| + } else { \
|
| + return DOMException::create(name, detailedMessage); \
|
| + }
|
|
|
| // InvalidModificationErrors:
|
| MAP_ERROR(GATT_INVALID_ATTRIBUTE_LENGTH, InvalidModificationError,
|
|
|