third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.h - Issue 2615093002: Typemap WebBluetoothDeviceId to WTF::String

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/BluetoothRemoteGATTCharacteristic.h

Issue 2615093002: Typemap WebBluetoothDeviceId to WTF::String (Closed)

Patch Set: merge master 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

« no previous file with comments | « third_party/WebKit/Source/modules/bluetooth/BluetoothDevice.cpp ('k') | third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.h

diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.h b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.h

index 4f0135d6aa892e7e4030c5e21aeea9d4c957c5c6..01166db410e9c3c502a3aaadc5327c059989ace5 100644

--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.h

+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.h

@@ -42,19 +42,15 @@ class BluetoothRemoteGATTCharacteristic final

public:

explicit BluetoothRemoteGATTCharacteristic(

ExecutionContext*,

- const String& characteristicInstanceId,

const String& serviceInstanceId,

- const String& uuid,

- uint32_t characteristicProperties,

+ mojom::blink::WebBluetoothRemoteGATTCharacteristicPtr,

BluetoothRemoteGATTService*,

BluetoothDevice*);

static BluetoothRemoteGATTCharacteristic* create(

ExecutionContext*,

- const String& characteristicInstanceId,

const String& serviceInstanceId,

- const String& uuid,

- uint32_t characteristicProperties,

+ mojom::blink::WebBluetoothRemoteGATTCharacteristicPtr,

BluetoothRemoteGATTService*,

BluetoothDevice*);

@@ -83,7 +79,7 @@ class BluetoothRemoteGATTCharacteristic final

// IDL exposed interface:

BluetoothRemoteGATTService* service() { return m_service; }

- String uuid() { return m_uuid; }

+ String uuid() { return m_characteristic->uuid; }

BluetoothCharacteristicProperties* properties() { return m_properties; }

DOMDataView* value() const { return m_value; }

ScriptPromise readValue(ScriptState*);

@@ -110,10 +106,8 @@ class BluetoothRemoteGATTCharacteristic final

void NotificationsCallback(ScriptPromiseResolver*,

mojom::blink::WebBluetoothResult);

- const String m_characteristicInstanceId;

const String m_serviceInstanceId;

- const String m_uuid;

- const uint32_t m_characteristicProperties;

+ mojom::blink::WebBluetoothRemoteGATTCharacteristicPtr m_characteristic;

Member<BluetoothRemoteGATTService> m_service;

bool m_stopped;