Source/modules/navigatorconnect/ServicePortCollection.cpp - Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always.

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: Source/modules/navigatorconnect/ServicePortCollection.cpp

Issue 1233173002: Have ScriptPromiseResolver on the Oilpan heap always. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: fix webusb ScriptPromiseResolver usage Created 5 years, 4 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 | « Source/modules/navigatorconnect/AcceptConnectionObserver.h ('k') | Source/modules/notifications/ServiceWorkerRegistrationNotifications.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/navigatorconnect/ServicePortCollection.cpp

diff --git a/Source/modules/navigatorconnect/ServicePortCollection.cpp b/Source/modules/navigatorconnect/ServicePortCollection.cpp

index fe244ca7ba6d96d7e698063101fc39ae0baa28a8..a5836d61d8356f677fbba867fbc82f195fb0296c 100644

--- a/Source/modules/navigatorconnect/ServicePortCollection.cpp

+++ b/Source/modules/navigatorconnect/ServicePortCollection.cpp

@@ -26,7 +26,7 @@ namespace {

class ConnectCallbacks : public WebServicePortConnectCallbacks {

public:

- ConnectCallbacks(PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver, ServicePortCollection* collection, const KURL& targetUrl, const String& portName, const String& serializedPortData)

+ ConnectCallbacks(ScriptPromiseResolver* resolver, ServicePortCollection* collection, const KURL& targetUrl, const String& portName, const String& serializedPortData)

: m_resolver(resolver), m_collection(collection), m_targetUrl(targetUrl), m_portName(portName), m_serializedPortData(serializedPortData)

{

ASSERT(m_resolver);

@@ -60,7 +60,7 @@ public:

}

private:

- RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;

+ Persistent<ScriptPromiseResolver> m_resolver;

Persistent<ServicePortCollection> m_collection;

KURL m_targetUrl;

String m_portName;

@@ -103,7 +103,7 @@ ScriptPromise ServicePortCollection::connect(ScriptState* scriptState, const Str

if (exceptionState.hadException())

return exceptionState.reject(scriptState);

}

- RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);

+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);

ScriptPromise promise = resolver->promise();

KURL targetUrl = scriptState->executionContext()->completeURL(url);

m_provider->connect(