Worker: Reduce use of ExecutionContextTask in core/workers

third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 304 matching lines @@
                      wrapCrossThreadWeakPersistent(m_loadingDocument.get())));
 }
 
 void WebSharedWorkerImpl::postTaskToWorkerGlobalScope(
     const WebTraceLocation& location,
     std::unique_ptr<WTF::CrossThreadClosure> task) {
   m_workerThread->postTask(location, std::move(task));
 }
 
 void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel) {
+  DCHECK(isMainThread());
   workerThread()->postTask(
       BLINK_FROM_HERE,
-      createCrossThreadTask(
-          &connectTask,
-          WTF::passed(WebMessagePortChannelUniquePtr(webChannel))));
+      crossThreadBind(&WebSharedWorkerImpl::connectTask,
+                      WTF::crossThreadUnretained(this),
+                      WTF::passed(WebMessagePortChannelUniquePtr(webChannel))));
 }
 
-void WebSharedWorkerImpl::connectTask(WebMessagePortChannelUniquePtr channel,
-                                      ExecutionContext* context) {
+void WebSharedWorkerImpl::connectTask(WebMessagePortChannelUniquePtr channel) {
   // Wrap the passed-in channel in a MessagePort, and send it off via a connect
   // event.
-  MessagePort* port = MessagePort::create(*context);
+  DCHECK(m_workerThread->isCurrentThread());
+  WorkerGlobalScope* workerGlobalScope =
+      toWorkerGlobalScope(m_workerThread->globalScope());
+  MessagePort* port = MessagePort::create(*workerGlobalScope);
   port->entangle(std::move(channel));
-  WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context);
   SECURITY_DCHECK(workerGlobalScope->isSharedWorkerGlobalScope());
   workerGlobalScope->dispatchEvent(createConnectEvent(port));
 }
 
 void WebSharedWorkerImpl::startWorkerContext(
     const WebURL& url,
     const WebString& name,
     const WebString& contentSecurityPolicy,
     WebContentSecurityPolicyType policyType,
     WebAddressSpace creationAddressSpace) {
@@ skipping 117 matching lines @@
   if (devtoolsAgent)
     devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method,
                                               message);
 }
 
 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) {
   return new WebSharedWorkerImpl(client);
 }
 
 }  // namespace blink