third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.h - Issue 2080623002: Revert "Remove OwnPtr from Blink."

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 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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 3079ec264911fc4de80f037f35b4c50a94700b73..efcc8006185aed8701a6092320cd6c97d7eaedf6 100644

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

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

@@ -13,8 +13,9 @@

#include "platform/heap/Handle.h"

#include "public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristic.h"

#include "public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristicInit.h"

+#include "wtf/OwnPtr.h"

+#include "wtf/PassOwnPtr.h"

#include "wtf/text/WTFString.h"

-#include <memory>

namespace blink {

@@ -40,11 +41,11 @@ class BluetoothRemoteGATTCharacteristic final

DEFINE_WRAPPERTYPEINFO();

USING_GARBAGE_COLLECTED_MIXIN(BluetoothRemoteGATTCharacteristic);

public:

- explicit BluetoothRemoteGATTCharacteristic(ExecutionContext*, std::unique_ptr<WebBluetoothRemoteGATTCharacteristicInit>);

+ explicit BluetoothRemoteGATTCharacteristic(ExecutionContext*, PassOwnPtr<WebBluetoothRemoteGATTCharacteristicInit>);

// Interface required by CallbackPromiseAdapter.

- using WebType = std::unique_ptr<WebBluetoothRemoteGATTCharacteristicInit>;

- static BluetoothRemoteGATTCharacteristic* take(ScriptPromiseResolver*, std::unique_ptr<WebBluetoothRemoteGATTCharacteristicInit>);

+ using WebType = OwnPtr<WebBluetoothRemoteGATTCharacteristicInit>;

+ static BluetoothRemoteGATTCharacteristic* take(ScriptPromiseResolver*, PassOwnPtr<WebBluetoothRemoteGATTCharacteristicInit>);

// Save value.

void setValue(DOMDataView*);

@@ -87,7 +88,7 @@ protected:

void addedEventListener(const AtomicString& eventType, RegisteredEventListener&) override;

private:

- std::unique_ptr<WebBluetoothRemoteGATTCharacteristicInit> m_webCharacteristic;

+ OwnPtr<WebBluetoothRemoteGATTCharacteristicInit> m_webCharacteristic;

bool m_stopped;

Member<BluetoothCharacteristicProperties> m_properties;

Member<DOMDataView> m_value;