Source/modules/serviceworkers/ServiceWorker.cpp - Issue 337053004: Don't assert when ServiceWorker::from is passed an empty promise

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/ServiceWorker.cpp

Issue 337053004: Don't assert when ServiceWorker::from is passed an empty promise (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: fix V8GarbageCollected ASSERT Created 6 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:

Index: Source/modules/serviceworkers/ServiceWorker.cpp

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

index 84bca65e79e81427d9d0f4b574245993cbde3738..0130fbccf02804c6281eb459dd14f8b0c550873a 100644

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

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

@@ -196,7 +196,10 @@ void ServiceWorker::onPromiseResolved()

void ServiceWorker::waitOnPromise(ScriptPromise promise)

{

setProxyState(RegisterPromisePending);

- promise.then(ThenFunction::create(this));

+ if (promise.isEmpty())

+ onPromiseResolved();

+ else

+ promise.then(ThenFunction::create(this));

}

bool ServiceWorker::hasPendingActivity() const