third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp - Issue 2183903002: bluetooth: Reject getPrimaryService(s) if frame is not connected

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2183903002: bluetooth: Reject getPrimaryService(s) if frame is not connected (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin

Patch Set: Clean up Created 4 years, 5 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

« third_party/WebKit/LayoutTests/bluetooth/getPrimaryServices/disconnected-device.html ('K') | « third_party/WebKit/LayoutTests/bluetooth/getPrimaryServices/disconnected-device-with-uuid.html ('k') | third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.h » ('j') | third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTServer.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp

diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp

index e717ea2d9ac9385eb3a465496ea9a2978929e4e4..e3ca6e56b2d292739f60d3d445d3ee4075920c14 100644

--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp

+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp

@@ -48,6 +48,7 @@ bool BluetoothDevice::disconnectGATTIfConnected()

{

if (m_gatt->connected()) {

m_gatt->setConnected(false);

+ m_gatt->ClearActiveAlgorithms();

BluetoothSupplement::fromExecutionContext(getExecutionContext())->disconnect(id());

return true;

}

@@ -68,6 +69,7 @@ void BluetoothDevice::dispatchGattServerDisconnected()

{

if (m_gatt->connected()) {

m_gatt->setConnected(false);

+ m_gatt->ClearActiveAlgorithms();

dispatchEvent(Event::createBubble(EventTypeNames::gattserverdisconnected));

}