Source/modules/serviceworkers/ServiceWorkerContainer.cpp - Issue 1240763002: CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3).

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/serviceworkers/ServiceWorkerContainer.cpp

Issue 1240763002: CallbackPromiseAdapter types should be more compatible with WebCallbacks (3/3). (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 5 years, 5 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

« Source/bindings/core/v8/CallbackPromiseAdapter.h ('K') | « Source/modules/serviceworkers/ServiceWorkerClients.cpp ('k') | Source/modules/serviceworkers/ServiceWorkerError.h » ('j') | public/platform/modules/push_messaging/WebPushProvider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/modules/serviceworkers/ServiceWorkerContainer.cpp

diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

index cbb117f1608a182fa1b5eb6f6cb283d14054f27d..15911f75ccd47647a86531fa1417f82811775f30 100644

--- a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

+++ b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp

@@ -76,7 +76,7 @@ public:

OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);

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

return;

- m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error.release()));

+ m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));

}

private:

@@ -108,7 +108,7 @@ public:

OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);

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

return;

- m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error.release()));

+ m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));

}

private:

@@ -137,7 +137,7 @@ public:

OwnPtr<WebServiceWorkerError> error = adoptPtr(errorRaw);

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

return;

- m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), error.release()));

+ m_resolver->reject(ServiceWorkerError::take(m_resolver.get(), *error));

}

private: