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

Unified Diff: third_party/WebKit/Source/modules/permissions/PermissionsCallback.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
Index: third_party/WebKit/Source/modules/permissions/PermissionsCallback.h
diff --git a/third_party/WebKit/Source/modules/permissions/PermissionsCallback.h b/third_party/WebKit/Source/modules/permissions/PermissionsCallback.h
index 2173f58e15fdc0d72954b5aba43789524a88930f..a2351c991d2a57338becadd1911e1c033aad3d17 100644
--- a/third_party/WebKit/Source/modules/permissions/PermissionsCallback.h
+++ b/third_party/WebKit/Source/modules/permissions/PermissionsCallback.h
@@ -13,6 +13,7 @@
#include "wtf/Noncopyable.h"
#include "wtf/PassRefPtr.h"
#include "wtf/RefPtr.h"
+
#include <memory>
namespace blink {
@@ -26,7 +27,7 @@ class ScriptPromiseResolver;
class PermissionsCallback final
: public WebCallbacks<std::unique_ptr<WebVector<WebPermissionStatus>>, void> {
public:
- PermissionsCallback(ScriptPromiseResolver*, std::unique_ptr<Vector<WebPermissionType>>, std::unique_ptr<Vector<int>>);
+ PermissionsCallback(ScriptPromiseResolver*, PassOwnPtr<Vector<WebPermissionType>>, PassOwnPtr<Vector<int>>);
~PermissionsCallback() = default;
void onSuccess(std::unique_ptr<WebVector<WebPermissionStatus>>) override;
@@ -36,12 +37,12 @@ private:
Persistent<ScriptPromiseResolver> m_resolver;
// The permission types which were passed to the client to be requested.
- std::unique_ptr<Vector<WebPermissionType>> m_internalPermissions;
+ OwnPtr<Vector<WebPermissionType>> m_internalPermissions;
// Maps each index in the caller vector to the corresponding index in the
// internal vector (i.e. the vector passsed to the client) such that both
// indices have the same WebPermissionType.
- std::unique_ptr<Vector<int>> m_callerIndexToInternalIndex;
+ OwnPtr<Vector<int>> m_callerIndexToInternalIndex;
WTF_MAKE_NONCOPYABLE(PermissionsCallback);
};

Powered by Google App Engine
This is Rietveld 408576698