WebSocket: Stop Bridge::disconnect() from waiting until Peer::disconnect() is complete

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

 /*
  * Copyright (C) 2011 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 71 matching lines @@
     void disconnect() override; // Will suppress didClose().
 
     DECLARE_VIRTUAL_TRACE();
 
     class Bridge;
     // Allocated and used in the main thread.
     class Peer final : public GarbageCollectedFinalized<Peer>, public WebSocketChannelClient, public WorkerThreadLifecycleObserver {
         USING_GARBAGE_COLLECTED_MIXIN(Peer);
         WTF_MAKE_NONCOPYABLE(Peer);
     public:
-        Peer(Bridge*, PassRefPtr<WorkerLoaderProxy>, WebSocketChannelSyncHelper*, WorkerThreadLifecycleContext*);
+        Peer(Bridge*, PassRefPtr<WorkerLoaderProxy>, WorkerThreadLifecycleContext*);
         ~Peer() override;
 
         // SourceLocation parameter may be shown when the connection fails.
         bool initialize(std::unique_ptr<SourceLocation>, ExecutionContext*);
 
         bool connect(const KURL&, const String& protocol);
         void sendTextAsCharVector(std::unique_ptr<Vector<char>>);
         void sendBinaryAsCharVector(std::unique_ptr<Vector<char>>);
         void sendBlob(PassRefPtr<BlobDataHandle>);
         void close(int code, const String& reason);
@@ skipping 13 matching lines @@
         void didClose(ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) override;
         void didError() override;
 
         // WorkerThreadLifecycleObserver function.
         void contextDestroyed() override;
 
     private:
         CrossThreadWeakPersistent<Bridge> m_bridge;
         RefPtr<WorkerLoaderProxy> m_loaderProxy;
         Member<WebSocketChannel> m_mainWebSocketChannel;
-        Member<WebSocketChannelSyncHelper> m_syncHelper;
     };
 
     // Bridge for Peer. Running on the worker thread.
     class Bridge final : public GarbageCollectedFinalized<Bridge> {
         WTF_MAKE_NONCOPYABLE(Bridge);
     public:
         Bridge(WebSocketChannelClient*, WorkerGlobalScope&);
         ~Bridge();
 
         // SourceLocation parameter may be shown when the connection fails.
         bool connect(std::unique_ptr<SourceLocation>, const KURL&, const String& protocol);
 
         void send(const CString& message);
         void send(const DOMArrayBuffer&, unsigned byteOffset, unsigned byteLength);
         void send(PassRefPtr<BlobDataHandle>);
         void close(int code, const String& reason);
         void fail(const String& reason, MessageLevel, std::unique_ptr<SourceLocation>);
         void disconnect();
 
-        void connectOnMainThread(std::unique_ptr<SourceLocation>, WorkerThreadLifecycleContext*, const KURL&, const String& protocol, ExecutionContext*);
+        void connectOnMainThread(std::unique_ptr<SourceLocation>, WorkerThreadLifecycleContext*, const KURL&, const String& protocol, WebSocketChannelSyncHelper*, ExecutionContext*);
 
         // Returns null when |disconnect| has already been called.
         WebSocketChannelClient* client() { return m_client; }
 
         DECLARE_TRACE();
         // Promptly clear connection to peer + loader proxy.
         EAGERLY_FINALIZE();
 
     private:
-        // Returns false if shutdown event is received before method completion.
-        bool waitForMethodCompletion(const WebTraceLocation&, std::unique_ptr<ExecutionContextTask>);
-
         Member<WebSocketChannelClient> m_client;
         Member<WorkerGlobalScope> m_workerGlobalScope;
         RefPtr<WorkerLoaderProxy> m_loaderProxy;
-        Member<WebSocketChannelSyncHelper> m_syncHelper;
         CrossThreadPersistent<Peer> m_peer;
     };
 
 private:
     WorkerWebSocketChannel(WorkerGlobalScope&, WebSocketChannelClient*, std::unique_ptr<SourceLocation>);
 
     Member<Bridge> m_bridge;
     std::unique_ptr<SourceLocation> m_locationAtConnection;
 };
 
 } // namespace blink
 
 #endif // WorkerWebSocketChannel_h