third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp - 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/serviceworkers/ServiceWorkerContainerClient.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

« no previous file with comments | « third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.h ('k') | third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

diff --git a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

index 7237bfab5e89a3b5de54bb857c9a8d720b515527..8842166df23d47dba4fd706448a779197646a30c 100644

--- a/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

+++ b/third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainerClient.cpp

@@ -10,16 +10,15 @@

#include "core/loader/FrameLoaderClient.h"

#include "core/workers/WorkerGlobalScope.h"

#include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"

-#include <memory>

namespace blink {

-ServiceWorkerContainerClient* ServiceWorkerContainerClient::create(std::unique_ptr<WebServiceWorkerProvider> provider)

+ServiceWorkerContainerClient* ServiceWorkerContainerClient::create(PassOwnPtr<WebServiceWorkerProvider> provider)

{

return new ServiceWorkerContainerClient(std::move(provider));

}

-ServiceWorkerContainerClient::ServiceWorkerContainerClient(std::unique_ptr<WebServiceWorkerProvider> provider)

+ServiceWorkerContainerClient::ServiceWorkerContainerClient(PassOwnPtr<WebServiceWorkerProvider> provider)

: m_provider(std::move(provider))

{

}

@@ -52,7 +51,7 @@ ServiceWorkerContainerClient* ServiceWorkerContainerClient::from(ExecutionContex

return client;

}

-void provideServiceWorkerContainerClientToWorker(WorkerClients* clients, std::unique_ptr<WebServiceWorkerProvider> provider)

+void provideServiceWorkerContainerClientToWorker(WorkerClients* clients, PassOwnPtr<WebServiceWorkerProvider> provider)

{

clients->provideSupplement(ServiceWorkerContainerClient::supplementName(), ServiceWorkerContainerClient::create(std::move(provider)));

}