DevTools: make shared worker connect pausable..

..otherwise we ignore connection event when we paused at shared worker
initialization.
This bug was introduced by workers refactoring [1].

[1] https://chromium-review.googlesource.com/c/chromium/src/+/1205802

R=dgozman@chromium.org

Bug: chromium:775132
Change-Id: I1d7c68d0c6339eaae4bd74c7a1953273f5ce8f2b
Reviewed-on: https://chromium-review.googlesource.com/1237249
Commit-Queue: Aleksey Kozyatinskiy <kozyatinskiy@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: Tsuyoshi Horo <horo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593037}

chrome/test/data/workers/debug_shared_worker_initialization.js

-debugger;
 var globalVar = 2011;
 onconnect = function(e) {
   var port = e.ports[0];
+  console.log('connected');
   port.postMessage("pong");
 }
 

third_party/blink/renderer/core/exported/web_shared_worker_impl.cc

@@ -197,10 +197,9 @@ void WebSharedWorkerImpl::ConnectTaskOnWorkerThread(
   DCHECK(worker_thread_->IsCurrentThread());
   WorkerGlobalScope* worker_global_scope =
       ToWorkerGlobalScope(worker_thread_->GlobalScope());
-  MessagePort* port = MessagePort::Create(*worker_global_scope);
-  port->Entangle(std::move(channel));
   SECURITY_DCHECK(worker_global_scope->IsSharedWorkerGlobalScope());
-  worker_global_scope->DispatchEvent(*CreateConnectEvent(port));
+  static_cast<SharedWorkerGlobalScope*>(worker_global_scope)
+      ->ConnectPausable(std::move(channel));
 }
 
 void WebSharedWorkerImpl::StartWorkerContext(

third_party/blink/renderer/core/workers/shared_worker_global_scope.cc

@@ -41,13 +41,6 @@
 
 namespace blink {
 
-MessageEvent* CreateConnectEvent(MessagePort* port) {
-  MessageEvent* event = MessageEvent::Create(new MessagePortArray(1, port),
-                                             String(), String(), port);
-  event->initEvent(EventTypeNames::connect, false, false);
-  return event;
-}
-
 SharedWorkerGlobalScope::SharedWorkerGlobalScope(
     const String& name,
     std::unique_ptr<GlobalScopeCreationParams> creation_params,
@@ -79,6 +72,21 @@ void SharedWorkerGlobalScope::ImportModuleScript(
   NOTREACHED();
 }
 
+void SharedWorkerGlobalScope::ConnectPausable(MessagePortChannel channel) {
+  if (IsContextPaused()) {
+    AddPausedCall(WTF::Bind(&SharedWorkerGlobalScope::ConnectPausable,
+                            WrapWeakPersistent(this), std::move(channel)));
+    return;
+  }
+
+  MessagePort* port = MessagePort::Create(*this);
+  port->Entangle(std::move(channel));
+  MessageEvent* event = MessageEvent::Create(new MessagePortArray(1, port),
+                                             String(), String(), port);
+  event->initEvent(EventTypeNames::connect, false, false);
+  DispatchEvent(*event);
+}
+
 void SharedWorkerGlobalScope::ExceptionThrown(ErrorEvent* event) {
   WorkerGlobalScope::ExceptionThrown(event);
   if (WorkerThreadDebugger* debugger =

third_party/blink/renderer/core/workers/shared_worker_global_scope.h

@@ -32,6 +32,7 @@
 #define THIRD_PARTY_BLINK_RENDERER_CORE_WORKERS_SHARED_WORKER_GLOBAL_SCOPE_H_
 
 #include <memory>
+#include "third_party/blink/public/common/messaging/message_port_channel.h"
 #include "third_party/blink/renderer/core/core_export.h"
 #include "third_party/blink/renderer/core/workers/global_scope_creation_params.h"
 #include "third_party/blink/renderer/core/workers/worker_global_scope.h"
@@ -39,7 +40,6 @@
 
 namespace blink {
 
-class MessageEvent;
 class SharedWorkerThread;
 
 class SharedWorkerGlobalScope final : public WorkerGlobalScope {
@@ -67,6 +67,8 @@ class SharedWorkerGlobalScope final : public WorkerGlobalScope {
   DEFINE_ATTRIBUTE_EVENT_LISTENER(connect);
   String name() const { return name_; }
 
+  void ConnectPausable(MessagePortChannel channel);
+
   void Trace(blink::Visitor*) override;
 
  private:
@@ -74,9 +76,6 @@ class SharedWorkerGlobalScope final : public WorkerGlobalScope {
 
   const String name_;
 };
-
-CORE_EXPORT MessageEvent* CreateConnectEvent(MessagePort*);
-
 }  // namespace blink
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_CORE_WORKERS_SHARED_WORKER_GLOBAL_SCOPE_H_

third_party/blink/renderer/core/workers/worker_global_scope.cc

@@ -327,7 +327,7 @@ void WorkerGlobalScope::EvaluateClassicScriptPausable(
     std::unique_ptr<Vector<char>> cached_meta_data,
     const v8_inspector::V8StackTraceId& stack_id) {
   if (IsContextPaused()) {
-    paused_calls_.push_back(WTF::Bind(
+    AddPausedCall(WTF::Bind(
         &WorkerGlobalScope::EvaluateClassicScriptPausable,
         WrapWeakPersistent(this), script_url, access_control_status,
         source_code, WTF::Passed(std::move(cached_meta_data)), stack_id));
@@ -347,10 +347,9 @@ void WorkerGlobalScope::ImportModuleScriptPausable(
     FetchClientSettingsObjectSnapshot* outside_settings_object,
     network::mojom::FetchCredentialsMode mode) {
   if (IsContextPaused()) {
-    paused_calls_.push_back(
-        WTF::Bind(&WorkerGlobalScope::ImportModuleScriptPausable,
-                  WrapWeakPersistent(this), module_url_record,
-                  WrapPersistent(outside_settings_object), mode));
+    AddPausedCall(WTF::Bind(&WorkerGlobalScope::ImportModuleScriptPausable,
+                            WrapWeakPersistent(this), module_url_record,
+                            WrapPersistent(outside_settings_object), mode));
     return;
   }
   ImportModuleScript(module_url_record, outside_settings_object, mode);
@@ -359,9 +358,8 @@ void WorkerGlobalScope::ImportModuleScriptPausable(
 void WorkerGlobalScope::ReceiveMessagePausable(
     BlinkTransferableMessage message) {
   if (IsContextPaused()) {
-    paused_calls_.push_back(
-        WTF::Bind(&WorkerGlobalScope::ReceiveMessagePausable,
-                  WrapWeakPersistent(this), std::move(message)));
+    AddPausedCall(WTF::Bind(&WorkerGlobalScope::ReceiveMessagePausable,
+                            WrapWeakPersistent(this), std::move(message)));
     return;
   }
 
@@ -402,6 +400,10 @@ void WorkerGlobalScope::EvaluateClassicScript(
   ReportingProxy().DidEvaluateClassicScript(success);
 }
 
+void WorkerGlobalScope::AddPausedCall(base::OnceClosure closure) {
+  paused_calls_.push_back(std::move(closure));
+}
+
 WorkerGlobalScope::WorkerGlobalScope(
     std::unique_ptr<GlobalScopeCreationParams> creation_params,
     WorkerThread* thread,

third_party/blink/renderer/core/workers/worker_global_scope.h

@@ -188,6 +188,8 @@ class CORE_EXPORT WorkerGlobalScope
       FetchClientSettingsObjectSnapshot* outside_settings_object,
       network::mojom::FetchCredentialsMode) = 0;
 
+  void AddPausedCall(base::OnceClosure closure);
+
  private:
   void SetWorkerSettings(std::unique_ptr<WorkerSettings>);
 

third_party/blink/renderer/devtools/front_end/Tests.js

@@ -576,10 +576,18 @@
     function callback() {
       const debuggerModel = SDK.targetManager.models(SDK.DebuggerModel)[0];
       if (debuggerModel.isPaused()) {
-        this.releaseControl();
+        SDK.consoleModel.addEventListener(SDK.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
+        debuggerModel.resume();
         return;
       }
-      this._waitForScriptPause(this.releaseControl.bind(this));
+      this._waitForScriptPause(callback.bind(this));
+    }
+
+    function onConsoleMessage(event) {
+      const message = event.data.messageText;
+      if (message !== 'connected')
+        this.fail('Unexpected message: ' + message);
+      this.releaseControl();
     }
   };