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

Unified Diff: third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp

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/presentation/PresentationConnection.cpp
diff --git a/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp b/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp
index c1ccce2b58ba49d0a97749041e2c272a8ee73015..70c9c53a1ce1b9b6184d7825d5a2609e8aaffc23 100644
--- a/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp
+++ b/third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp
@@ -24,8 +24,8 @@
#include "modules/presentation/PresentationRequest.h"
#include "public/platform/modules/presentation/WebPresentationConnectionClient.h"
#include "wtf/Assertions.h"
+#include "wtf/OwnPtr.h"
#include "wtf/text/AtomicString.h"
-#include <memory>
namespace blink {
@@ -171,7 +171,7 @@ PresentationConnection::~PresentationConnection()
}
// static
-PresentationConnection* PresentationConnection::take(ScriptPromiseResolver* resolver, std::unique_ptr<WebPresentationConnectionClient> client, PresentationRequest* request)
+PresentationConnection* PresentationConnection::take(ScriptPromiseResolver* resolver, PassOwnPtr<WebPresentationConnectionClient> client, PresentationRequest* request)
{
ASSERT(resolver);
ASSERT(client);
@@ -190,7 +190,7 @@ PresentationConnection* PresentationConnection::take(ScriptPromiseResolver* reso
}
// static
-PresentationConnection* PresentationConnection::take(PresentationController* controller, std::unique_ptr<WebPresentationConnectionClient> client, PresentationRequest* request)
+PresentationConnection* PresentationConnection::take(PresentationController* controller, PassOwnPtr<WebPresentationConnectionClient> client, PresentationRequest* request)
{
ASSERT(controller);
ASSERT(request);
@@ -355,7 +355,7 @@ void PresentationConnection::didReceiveBinaryMessage(const uint8_t* data, size_t
switch (m_binaryType) {
case BinaryTypeBlob: {
- std::unique_ptr<BlobData> blobData = BlobData::create();
+ OwnPtr<BlobData> blobData = BlobData::create();
blobData->appendBytes(data, length);
Blob* blob = Blob::create(BlobDataHandle::create(std::move(blobData), length));
dispatchEvent(MessageEvent::create(blob));

Powered by Google App Engine
This is Rietveld 408576698