third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp - Issue 2043583002: Remove the use of OwnedPtrDeleter in WebMessagePortChannel.

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/web/SharedWorkerRepositoryClientImpl.cpp

Issue 2043583002: Remove the use of OwnedPtrDeleter in WebMessagePortChannel. (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/web/SharedWorkerRepositoryClientImpl.h ('k') | third_party/WebKit/Source/web/WebDOMMessageEvent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp

diff --git a/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp b/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp

index 42e7c9e1e71d5b671af71da152884c9a2c583f06..9971e96878fff495f6dacfabbc06d5c29c9e3256 100644

--- a/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp

+++ b/third_party/WebKit/Source/web/SharedWorkerRepositoryClientImpl.cpp

@@ -56,7 +56,7 @@ namespace blink {

// Callback class that keeps the SharedWorker and WebSharedWorker objects alive while connecting.

class SharedWorkerConnector : private WebSharedWorkerConnector::ConnectListener {

public:

- SharedWorkerConnector(SharedWorker* worker, const KURL& url, const String& name, PassOwnPtr<WebMessagePortChannel> channel, PassOwnPtr<WebSharedWorkerConnector> webWorkerConnector)

+ SharedWorkerConnector(SharedWorker* worker, const KURL& url, const String& name, WebMessagePortChannelUniquePtr channel, PassOwnPtr<WebSharedWorkerConnector> webWorkerConnector)

: m_worker(worker)

, m_url(url)

, m_name(name)

@@ -75,7 +75,7 @@ private:

KURL m_url;

String m_name;

OwnPtr<WebSharedWorkerConnector> m_webWorkerConnector;

- OwnPtr<WebMessagePortChannel> m_channel;

+ WebMessagePortChannelUniquePtr m_channel;

};

SharedWorkerConnector::~SharedWorkerConnector()

@@ -86,7 +86,7 @@ SharedWorkerConnector::~SharedWorkerConnector()

void SharedWorkerConnector::connect()

{

m_worker->setIsBeingConnected(true);

- m_webWorkerConnector->connect(m_channel.leakPtr(), this);

+ m_webWorkerConnector->connect(m_channel.release(), this);

}

void SharedWorkerConnector::connected()

@@ -108,7 +108,7 @@ static WebSharedWorkerRepositoryClient::DocumentID getId(void* document)

return reinterpret_cast<WebSharedWorkerRepositoryClient::DocumentID>(document);

}

-void SharedWorkerRepositoryClientImpl::connect(SharedWorker* worker, PassOwnPtr<WebMessagePortChannel> port, const KURL& url, const String& name, ExceptionState& exceptionState)

+void SharedWorkerRepositoryClientImpl::connect(SharedWorker* worker, WebMessagePortChannelUniquePtr port, const KURL& url, const String& name, ExceptionState& exceptionState)

{

DCHECK(m_client);