third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerClients.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/ServiceWorkerClients.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/ServiceWorkerClient.cpp ('k') | third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerContainer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ab56d4fce639f06aad9b3e182ab2903f45d7811c..85cad8aa264bc55917cb861d8408fb4a4562974d 100644

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

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

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

#include "modules/serviceworkers/ServiceWorkerWindowClientCallback.h"

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

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

-#include "wtf/PtrUtil.h"

+#include "wtf/OwnPtr.h"

+#include "wtf/PassOwnPtr.h"

#include "wtf/RefPtr.h"

#include "wtf/Vector.h"

-#include <memory>

namespace blink {

@@ -68,7 +68,7 @@ public:

void onSuccess(std::unique_ptr<WebServiceWorkerClientInfo> webClient) override

{

- std::unique_ptr<WebServiceWorkerClientInfo> client = wrapUnique(webClient.release());

+ OwnPtr<WebServiceWorkerClientInfo> client = adoptPtr(webClient.release());

if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())

return;

if (!client) {