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

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

Issue 2637343002: Implement WebBluetooth descriptor.readValue() (Closed)
Patch Set: run bad_message_reasons 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/BluetoothRemoteGATTCharacteristic.cpp
diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
index 89a1ea228b9310bb9b7cfa6293570c69c9dac058..3b74ec5f0397fae66cb0a4770582d2cc65b9845c 100644
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp
@@ -101,8 +101,7 @@ void BluetoothRemoteGATTCharacteristic::ReadValueCallback(
resolver->getExecutionContext()->isContextDestroyed())
return;
- // If the resolver is not in the set of ActiveAlgorithms then the frame
- // disconnected so we reject.
+ // If the device is disconnected, reject.
if (!getGatt()->RemoveFromActiveAlgorithms(resolver)) {
resolver->reject(BluetoothRemoteGATTUtils::CreateDOMException(
BluetoothRemoteGATTUtils::ExceptionType::kGATTServerDisconnected));
@@ -122,7 +121,6 @@ void BluetoothRemoteGATTCharacteristic::ReadValueCallback(
ScriptPromise BluetoothRemoteGATTCharacteristic::readValue(
ScriptState* scriptState) {
- // We always check that the device is connected.
if (!getGatt()->connected()) {
return ScriptPromise::rejectWithDOMException(
scriptState,
@@ -160,8 +158,7 @@ void BluetoothRemoteGATTCharacteristic::WriteValueCallback(
resolver->getExecutionContext()->isContextDestroyed())
return;
- // If the resolver is not in the set of ActiveAlgorithms then the frame
- // disconnected so we reject.
+ // If the device is disconnected, reject.
if (!getGatt()->RemoveFromActiveAlgorithms(resolver)) {
resolver->reject(BluetoothRemoteGATTUtils::CreateDOMException(
BluetoothRemoteGATTUtils::ExceptionType::kGATTServerDisconnected));
@@ -179,7 +176,6 @@ void BluetoothRemoteGATTCharacteristic::WriteValueCallback(
ScriptPromise BluetoothRemoteGATTCharacteristic::writeValue(
ScriptState* scriptState,
const DOMArrayPiece& value) {
- // We always check that the device is connected.
if (!getGatt()->connected()) {
return ScriptPromise::rejectWithDOMException(
scriptState,
@@ -231,8 +227,7 @@ void BluetoothRemoteGATTCharacteristic::NotificationsCallback(
resolver->getExecutionContext()->isContextDestroyed())
return;
- // If the resolver is not in the set of ActiveAlgorithms then the frame
- // disconnected so we reject.
+ // If the device is disconnected, reject.
if (!getGatt()->RemoveFromActiveAlgorithms(resolver)) {
resolver->reject(BluetoothRemoteGATTUtils::CreateDOMException(
BluetoothRemoteGATTUtils::ExceptionType::kGATTServerDisconnected));
@@ -248,7 +243,6 @@ void BluetoothRemoteGATTCharacteristic::NotificationsCallback(
ScriptPromise BluetoothRemoteGATTCharacteristic::startNotifications(
ScriptState* scriptState) {
- // We always check that the device is connected.
if (!getGatt()->connected()) {
return ScriptPromise::rejectWithDOMException(
scriptState,
@@ -280,7 +274,6 @@ ScriptPromise BluetoothRemoteGATTCharacteristic::startNotifications(
ScriptPromise BluetoothRemoteGATTCharacteristic::stopNotifications(
ScriptState* scriptState) {
- // We always check that the device is connected.
if (!getGatt()->connected()) {
return ScriptPromise::rejectWithDOMException(
scriptState,
@@ -395,8 +388,7 @@ void BluetoothRemoteGATTCharacteristic::GetDescriptorsCallback(
resolver->getExecutionContext()->isContextDestroyed())
return;
- // If the resolver is not in the set of ActiveAlgorithms then the frame
- // disconnected so we reject.
+ // If the device is disconnected, reject.
if (!service()->device()->gatt()->RemoveFromActiveAlgorithms(resolver)) {
resolver->reject(BluetoothRemoteGATTUtils::CreateDOMException(
BluetoothRemoteGATTUtils::ExceptionType::kGATTServerDisconnected));

Powered by Google App Engine
This is Rietveld 408576698