ASSERTION FAILED: m_suspendIfNeededWasCalled

https://bugs.webkit.org/show_bug.cgi?id=268194 rdar://121689893 Reviewed by Darin Adler. Protect the scriptExecutionContext in NavigatorBase::serviceWorker() before passing it to ServiceWorkerContainer::create(). * Source/WebCore/page/NavigatorBase.cpp: (WebCore::NavigatorBase::serviceWorker): Canonical link: https://commits.webkit.org/273637@main
WebKit · Jan 29, 2024 · 23ed729 · 23ed729
1 parent d7621ef
commit 23ed729
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Source/WebCore/page/NavigatorBase.cpp b/Source/WebCore/page/NavigatorBase.cpp
@@ -163,7 +163,7 @@ ServiceWorkerContainer& NavigatorBase::serviceWorker()
 {
     ASSERT(!scriptExecutionContext() || scriptExecutionContext()->settingsValues().serviceWorkersEnabled);
     if (!m_serviceWorkerContainer)
-        m_serviceWorkerContainer = ServiceWorkerContainer::create(scriptExecutionContext(), *this).moveToUniquePtr();
+        m_serviceWorkerContainer = ServiceWorkerContainer::create(protectedScriptExecutionContext().get(), *this).moveToUniquePtr();
     return *m_serviceWorkerContainer;
 }
 

diff --git a/Source/WebCore/workers/WorkerOrWorkletGlobalScope.cpp b/Source/WebCore/workers/WorkerOrWorkletGlobalScope.cpp
@@ -50,6 +50,7 @@ WorkerOrWorkletGlobalScope::WorkerOrWorkletGlobalScope(WorkerThreadType type, PA
     , m_referrerPolicy(referrerPolicy)
     , m_noiseInjectionHashSalt(noiseInjectionHashSalt)
 {
+    relaxAdoptionRequirement();
 }
 
 WorkerOrWorkletGlobalScope::~WorkerOrWorkletGlobalScope() = default;

diff --git a/Source/WebCore/workers/shared/SharedWorkerGlobalScope.cpp b/Source/WebCore/workers/shared/SharedWorkerGlobalScope.cpp
@@ -46,7 +46,6 @@ SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const Worke
     , m_name(name)
 {
     SCOPE_RELEASE_LOG("SharedWorkerGlobalScope:");
-    relaxAdoptionRequirement();
     applyContentSecurityPolicyResponseHeaders(params.contentSecurityPolicyResponseHeaders);
 }