public/platform/modules/bluetooth/WebBluetooth.h - Issue 1234603003: CallbackPromiseAdapter types should be more compatible with WebCallbacks (1/3).

Unified Diff: public/platform/modules/bluetooth/WebBluetooth.h

Issue 1234603003: CallbackPromiseAdapter types should be more compatible with WebCallbacks (1/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 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

« Source/bindings/core/v8/CallbackPromiseAdapter.h ('K') | « public/platform/modules/app_banner/WebAppBannerClient.h ('k') | public/platform/modules/notifications/WebNotificationManager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: public/platform/modules/bluetooth/WebBluetooth.h

diff --git a/public/platform/modules/bluetooth/WebBluetooth.h b/public/platform/modules/bluetooth/WebBluetooth.h

index 3056f3ee9d187ab2c70aa31208016fb31f2c4e98..1ec2f803541b5b147eda9cf7fd51a698ae1d1dd9 100644

--- a/public/platform/modules/bluetooth/WebBluetooth.h

+++ b/public/platform/modules/bluetooth/WebBluetooth.h

@@ -6,6 +6,7 @@

#define WebBluetooth_h

#include "public/platform/WebCallbacks.h"

+#include "public/platform/WebPrivateOwnPtr.h"

#include "public/platform/WebString.h"

#include "public/platform/WebVector.h"

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

@@ -21,27 +22,27 @@ struct WebRequestDeviceOptions;

// Success and failure callbacks for requestDevice.

// WebBluetoothDevice and WebBluetoothError object ownership is transferred.

-typedef WebCallbacks<WebBluetoothDevice*, WebBluetoothError*> WebBluetoothRequestDeviceCallbacks;

+using WebBluetoothRequestDeviceCallbacks = WebCallbacks<WebPrivateOwnPtr<WebBluetoothDevice>&&, WebPrivateOwnPtr<WebBluetoothError>&&>;

// Success and failure callbacks for connectGATT.

// WebBluetoothGATTRemoteServer and WebBluetoothError object ownership is transferred.

-typedef WebCallbacks<WebBluetoothGATTRemoteServer*, WebBluetoothError*> WebBluetoothConnectGATTCallbacks;

+using WebBluetoothConnectGATTCallbacks = WebCallbacks<WebPrivateOwnPtr<WebBluetoothGATTRemoteServer>&&, WebPrivateOwnPtr<WebBluetoothError>&&>;

// Success and failure callbacks for getPrimaryService.

// WebBluetoothGATTService and WebBluetoothError object ownership is transferred.

-typedef WebCallbacks<WebBluetoothGATTService*, WebBluetoothError*> WebBluetoothGetPrimaryServiceCallbacks;

+using WebBluetoothGetPrimaryServiceCallbacks = WebCallbacks<WebPrivateOwnPtr<WebBluetoothGATTService>&&, WebPrivateOwnPtr<WebBluetoothError>&&>;

// Success and failure callbacks for getCharacteristic.

// WebBluetoothCharacteristic and WebBluetoothError object ownership is transferred.

-typedef WebCallbacks<WebBluetoothGATTCharacteristic*, WebBluetoothError*> WebBluetoothGetCharacteristicCallbacks;

+using WebBluetoothGetCharacteristicCallbacks = WebCallbacks<WebPrivateOwnPtr<WebBluetoothGATTCharacteristic>&&, WebPrivateOwnPtr<WebBluetoothError>&&>;

// Success and failure callbacks for readValue.

// WebVector and WebBluetoothError object ownership is transferred.

-typedef WebCallbacks<WebVector<uint8_t>*, WebBluetoothError*> WebBluetoothReadValueCallbacks;

+using WebBluetoothReadValueCallbacks = WebCallbacks<WebPrivateOwnPtr<WebVector<uint8_t>>&&, WebPrivateOwnPtr<WebBluetoothError>&&>;

// Success and failure callbacks for writeValue.

// WebBluetoothError object ownership is transferred.

-typedef WebCallbacks<void, WebBluetoothError*> WebBluetoothWriteValueCallbacks;

+using WebBluetoothWriteValueCallbacks = WebCallbacks<void, WebPrivateOwnPtr<WebBluetoothError>&&>;

class WebBluetooth {

public: