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

Unified Diff: third_party/WebKit/Source/modules/presentation/PresentationController.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/PresentationController.cpp
diff --git a/third_party/WebKit/Source/modules/presentation/PresentationController.cpp b/third_party/WebKit/Source/modules/presentation/PresentationController.cpp
index 2cc3b32d6869dd30dc27b98fac194c9e98d3b4ad..f0904d2fb1c19933566e7f80bc6500d3242d4e08 100644
--- a/third_party/WebKit/Source/modules/presentation/PresentationController.cpp
+++ b/third_party/WebKit/Source/modules/presentation/PresentationController.cpp
@@ -7,8 +7,6 @@
#include "core/frame/LocalFrame.h"
#include "modules/presentation/PresentationConnection.h"
#include "public/platform/modules/presentation/WebPresentationClient.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
namespace blink {
@@ -67,12 +65,12 @@ void PresentationController::didStartDefaultSession(WebPresentationConnectionCli
{
if (!m_presentation || !m_presentation->defaultRequest())
return;
- PresentationConnection::take(this, wrapUnique(connectionClient), m_presentation->defaultRequest());
+ PresentationConnection::take(this, adoptPtr(connectionClient), m_presentation->defaultRequest());
}
void PresentationController::didChangeSessionState(WebPresentationConnectionClient* connectionClient, WebPresentationConnectionState state)
{
- std::unique_ptr<WebPresentationConnectionClient> client = wrapUnique(connectionClient);
+ OwnPtr<WebPresentationConnectionClient> client = adoptPtr(connectionClient);
PresentationConnection* connection = findConnection(client.get());
if (!connection)
@@ -82,7 +80,7 @@ void PresentationController::didChangeSessionState(WebPresentationConnectionClie
void PresentationController::didCloseConnection(WebPresentationConnectionClient* connectionClient, WebPresentationConnectionCloseReason reason, const WebString& message)
{
- std::unique_ptr<WebPresentationConnectionClient> client = wrapUnique(connectionClient);
+ OwnPtr<WebPresentationConnectionClient> client = adoptPtr(connectionClient);
PresentationConnection* connection = findConnection(client.get());
if (!connection)
@@ -92,7 +90,7 @@ void PresentationController::didCloseConnection(WebPresentationConnectionClient*
void PresentationController::didReceiveSessionTextMessage(WebPresentationConnectionClient* connectionClient, const WebString& message)
{
- std::unique_ptr<WebPresentationConnectionClient> client = wrapUnique(connectionClient);
+ OwnPtr<WebPresentationConnectionClient> client = adoptPtr(connectionClient);
PresentationConnection* connection = findConnection(client.get());
if (!connection)
@@ -102,7 +100,7 @@ void PresentationController::didReceiveSessionTextMessage(WebPresentationConnect
void PresentationController::didReceiveSessionBinaryMessage(WebPresentationConnectionClient* connectionClient, const uint8_t* data, size_t length)
{
- std::unique_ptr<WebPresentationConnectionClient> client = wrapUnique(connectionClient);
+ OwnPtr<WebPresentationConnectionClient> client = adoptPtr(connectionClient);
PresentationConnection* connection = findConnection(client.get());
if (!connection)

Powered by Google App Engine
This is Rietveld 408576698