Changeset 248676 in webkit

Timestamp:

Aug 14, 2019 10:21:15 AM (5 years ago)

Author:

youenn@apple.com

Message:

Update Worker::notifyFinished to not use emptySessionID
​https://bugs.webkit.org/show_bug.cgi?id=200710

Reviewed by Alex Christensen.

No change of behavior.

Exit early if context is gone since we should not dispatch events or create worker.
Make sure to unset pending activity using a ScopeExit.

• workers/Worker.cpp:

(WebCore::Worker::notifyFinished):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/Worker.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-14  Youenn Fablet  <youenn@apple.com>
+
+        Update Worker::notifyFinished to not use emptySessionID
+        https://bugs.webkit.org/show_bug.cgi?id=200710
+
+        Reviewed by Alex Christensen.
+
+        No change of behavior.
+
+        Exit early if context is gone since we should not dispatch events or create worker.
+        Make sure to unset pending activity using a ScopeExit.
+
+        * workers/Worker.cpp:
+        (WebCore::Worker::notifyFinished):
+
 2019-08-14  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/workers/Worker.cpp

@@ -44 +44 @@
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
+#include <wtf/Scope.h>
 
 namespace WebCore {
@@ -182 +183 @@
 void Worker::notifyFinished()
 {
+    auto clearLoader = makeScopeExit([this] {
+        m_scriptLoader = nullptr;
+        unsetPendingActivity(*this);
+    });
+
     auto* context = scriptExecutionContext();
-    PAL::SessionID sessionID = context ? context->sessionID() : PAL::SessionID::emptySessionID();
-
-    if (m_scriptLoader->failed() || !sessionID.isValid())
+    if (!context)
+        return;
+
+    if (m_scriptLoader->failed()) {
         dispatchEvent(Event::create(eventNames().errorEvent, Event::CanBubble::No, Event::IsCancelable::Yes));
-    else {
-        bool isOnline = platformStrategies()->loaderStrategy()->isOnLine();
-        const ContentSecurityPolicyResponseHeaders& contentSecurityPolicyResponseHeaders = m_contentSecurityPolicyResponseHeaders ? m_contentSecurityPolicyResponseHeaders.value() : scriptExecutionContext()->contentSecurityPolicy()->responseHeaders();
-        m_contextProxy.startWorkerGlobalScope(m_scriptLoader->url(), m_name, scriptExecutionContext()->userAgent(m_scriptLoader->url()), isOnline, m_scriptLoader->script(), contentSecurityPolicyResponseHeaders, m_shouldBypassMainWorldContentSecurityPolicy, m_workerCreationTime, m_runtimeFlags, sessionID);
-        InspectorInstrumentation::scriptImported(*scriptExecutionContext(), m_scriptLoader->identifier(), m_scriptLoader->script());
+        return;
     }
-    m_scriptLoader = nullptr;
-
-    unsetPendingActivity(*this);
+
+    bool isOnline = platformStrategies()->loaderStrategy()->isOnLine();
+    const ContentSecurityPolicyResponseHeaders& contentSecurityPolicyResponseHeaders = m_contentSecurityPolicyResponseHeaders ? m_contentSecurityPolicyResponseHeaders.value() : context->contentSecurityPolicy()->responseHeaders();
+    m_contextProxy.startWorkerGlobalScope(m_scriptLoader->url(), m_name, context->userAgent(m_scriptLoader->url()), isOnline, m_scriptLoader->script(), contentSecurityPolicyResponseHeaders, m_shouldBypassMainWorldContentSecurityPolicy, m_workerCreationTime, m_runtimeFlags, context->sessionID());
+    InspectorInstrumentation::scriptImported(*context, m_scriptLoader->identifier(), m_scriptLoader->script());
 }