Worker: Stop using ExecutionContextTask on WorkerLoaderProxy::postTaskToWorkerGlobalScope

third_party/WebKit/Source/modules/websockets/WorkerWebSocketChannel.cpp

 /*
  * Copyright (C) 2011, 2012 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 218 matching lines @@
 void Peer::disconnect() {
   DCHECK(isMainThread());
   if (!m_mainWebSocketChannel)
     return;
   m_mainWebSocketChannel->disconnect();
   m_mainWebSocketChannel = nullptr;
 }
 
 static void workerGlobalScopeDidConnect(Bridge* bridge,
                                         const String& subprotocol,
-                                        const String& extensions,
-                                        ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+                                        const String& extensions) {
   if (bridge && bridge->client())
     bridge->client()->didConnect(subprotocol, extensions);
 }
 
 void Peer::didConnect(const String& subprotocol, const String& extensions) {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
-      BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidConnect, m_bridge, subprotocol,
-                            extensions));
+      BLINK_FROM_HERE, crossThreadBind(&workerGlobalScopeDidConnect, m_bridge,
+                                       subprotocol, extensions));
 }
 
 static void workerGlobalScopeDidReceiveTextMessage(Bridge* bridge,
-                                                   const String& payload,
-                                                   ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+                                                   const String& payload) {
   if (bridge && bridge->client())
     bridge->client()->didReceiveTextMessage(payload);
 }
 
 void Peer::didReceiveTextMessage(const String& payload) {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
-      BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidReceiveTextMessage, m_bridge,
-                            payload));
+      BLINK_FROM_HERE, crossThreadBind(&workerGlobalScopeDidReceiveTextMessage,
+                                       m_bridge, payload));
 }
 
 static void workerGlobalScopeDidReceiveBinaryMessage(
     Bridge* bridge,
-    std::unique_ptr<Vector<char>> payload,
-    ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+    std::unique_ptr<Vector<char>> payload) {
   if (bridge && bridge->client())
     bridge->client()->didReceiveBinaryMessage(std::move(payload));
 }
 
 void Peer::didReceiveBinaryMessage(std::unique_ptr<Vector<char>> payload) {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidReceiveBinaryMessage, m_bridge,
-                            WTF::passed(std::move(payload))));
+      crossThreadBind(&workerGlobalScopeDidReceiveBinaryMessage, m_bridge,
+                      WTF::passed(std::move(payload))));
 }
 
-static void workerGlobalScopeDidConsumeBufferedAmount(
-    Bridge* bridge,
-    uint64_t consumed,
-    ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+static void workerGlobalScopeDidConsumeBufferedAmount(Bridge* bridge,
+                                                      uint64_t consumed) {
   if (bridge && bridge->client())
     bridge->client()->didConsumeBufferedAmount(consumed);
 }
 
 void Peer::didConsumeBufferedAmount(uint64_t consumed) {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidConsumeBufferedAmount,
-                            m_bridge, consumed));
+      crossThreadBind(&workerGlobalScopeDidConsumeBufferedAmount, m_bridge,
+                      consumed));
 }
 
-static void workerGlobalScopeDidStartClosingHandshake(
-    Bridge* bridge,
-    ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+static void workerGlobalScopeDidStartClosingHandshake(Bridge* bridge) {
   if (bridge && bridge->client())
     bridge->client()->didStartClosingHandshake();
 }
 
 void Peer::didStartClosingHandshake() {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidStartClosingHandshake,
-                            m_bridge));
+      crossThreadBind(&workerGlobalScopeDidStartClosingHandshake, m_bridge));
 }
 
 static void workerGlobalScopeDidClose(
     Bridge* bridge,
     WebSocketChannelClient::ClosingHandshakeCompletionStatus
         closingHandshakeCompletion,
     unsigned short code,
-    const String& reason,
-    ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+    const String& reason) {
   if (bridge && bridge->client())
     bridge->client()->didClose(closingHandshakeCompletion, code, reason);
 }
 
 void Peer::didClose(ClosingHandshakeCompletionStatus closingHandshakeCompletion,
                     unsigned short code,
                     const String& reason) {
   DCHECK(isMainThread());
   if (m_mainWebSocketChannel) {
     m_mainWebSocketChannel->disconnect();
     m_mainWebSocketChannel = nullptr;
   }
   m_loaderProxy->postTaskToWorkerGlobalScope(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidClose, m_bridge,
-                            closingHandshakeCompletion, code, reason));
+      crossThreadBind(&workerGlobalScopeDidClose, m_bridge,
+                      closingHandshakeCompletion, code, reason));
 }
 
-static void workerGlobalScopeDidError(Bridge* bridge,
-                                      ExecutionContext* context) {
-  DCHECK(context->isWorkerGlobalScope());
+static void workerGlobalScopeDidError(Bridge* bridge) {
   if (bridge && bridge->client())
     bridge->client()->didError();
 }
 
 void Peer::didError() {
   DCHECK(isMainThread());
   m_loaderProxy->postTaskToWorkerGlobalScope(
-      BLINK_FROM_HERE,
-      createCrossThreadTask(&workerGlobalScopeDidError, m_bridge));
+      BLINK_FROM_HERE, crossThreadBind(&workerGlobalScopeDidError, m_bridge));
 }
 
 void Peer::contextDestroyed(WorkerThreadLifecycleContext*) {
   DCHECK(isMainThread());
   if (m_mainWebSocketChannel) {
     m_mainWebSocketChannel->disconnect();
     m_mainWebSocketChannel = nullptr;
   }
   m_bridge = nullptr;
 }
@@ skipping 116 matching lines @@
   m_peer = nullptr;
   m_workerGlobalScope.clear();
 }
 
 DEFINE_TRACE(Bridge) {
   visitor->trace(m_client);
   visitor->trace(m_workerGlobalScope);
 }
 
 }  // namespace blink