Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(198)

Unified Diff: Source/modules/websockets/WorkerThreadableWebSocketChannel.h

Issue 701753002: [WebSocket] Remove "Threadable" from class names. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/websockets/WorkerThreadableWebSocketChannel.h
diff --git a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h b/Source/modules/websockets/WorkerThreadableWebSocketChannel.h
deleted file mode 100644
index 0728634831b6bccabe6d18c75b73c131b0f564cd..0000000000000000000000000000000000000000
--- a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WorkerThreadableWebSocketChannel_h
-#define WorkerThreadableWebSocketChannel_h
-
-#include "core/frame/ConsoleTypes.h"
-#include "modules/websockets/WebSocketChannel.h"
-#include "modules/websockets/WebSocketChannelClient.h"
-#include "platform/heap/Handle.h"
-#include "wtf/Assertions.h"
-#include "wtf/Forward.h"
-#include "wtf/OwnPtr.h"
-#include "wtf/RefPtr.h"
-#include "wtf/Vector.h"
-#include "wtf/text/WTFString.h"
-
-namespace blink {
-
-class BlobDataHandle;
-class KURL;
-class ExecutionContext;
-class ExecutionContextTask;
-class ThreadableWebSocketChannelSyncHelper;
-class WorkerGlobalScope;
-class WorkerLoaderProxy;
-
-class WorkerThreadableWebSocketChannel final : public WebSocketChannel {
- WTF_MAKE_NONCOPYABLE(WorkerThreadableWebSocketChannel);
-public:
- static WebSocketChannel* create(WorkerGlobalScope& workerGlobalScope, WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber)
- {
- return new WorkerThreadableWebSocketChannel(workerGlobalScope, client, sourceURL, lineNumber);
- }
- virtual ~WorkerThreadableWebSocketChannel();
-
- // WebSocketChannel functions.
- virtual bool connect(const KURL&, const String& protocol) override;
- virtual void send(const String& message) override;
- virtual void send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength) override;
- virtual void send(PassRefPtr<BlobDataHandle>) override;
- virtual void send(PassOwnPtr<Vector<char> >) override
- {
- ASSERT_NOT_REACHED();
- }
- virtual void close(int code, const String& reason) override;
- virtual void fail(const String& reason, MessageLevel, const String&, unsigned) override;
- virtual void disconnect() override; // Will suppress didClose().
- virtual void suspend() override { }
- virtual void resume() override { }
-
- virtual void trace(Visitor*) override;
-
- class Bridge;
- // Allocated in the worker thread, but used in the main thread.
- class Peer final : public GarbageCollectedFinalized<Peer>, public WebSocketChannelClient {
- USING_GARBAGE_COLLECTED_MIXIN(Peer);
- WTF_MAKE_NONCOPYABLE(Peer);
- public:
- Peer(Bridge*, WorkerLoaderProxy&, ThreadableWebSocketChannelSyncHelper*);
- virtual ~Peer();
-
- // sourceURLAtConnection and lineNumberAtConnection parameters may
- // be shown when the connection fails.
- static void initialize(ExecutionContext* executionContext, Peer* peer, const String& sourceURLAtConnection, unsigned lineNumberAtConnection)
- {
- peer->initializeInternal(executionContext, sourceURLAtConnection, lineNumberAtConnection);
- }
-
- void connect(const KURL&, const String& protocol);
- void send(const String& message);
- void sendArrayBuffer(PassOwnPtr<Vector<char> >);
- void sendBlob(PassRefPtr<BlobDataHandle>);
- void bufferedAmount();
- void close(int code, const String& reason);
- void fail(const String& reason, MessageLevel, const String& sourceURL, unsigned lineNumber);
- void disconnect();
-
- virtual void trace(Visitor*) override;
-
- // WebSocketChannelClient functions.
- virtual void didConnect(const String& subprotocol, const String& extensions) override;
- virtual void didReceiveTextMessage(const String& payload) override;
- virtual void didReceiveBinaryMessage(PassOwnPtr<Vector<char> >) override;
- virtual void didConsumeBufferedAmount(unsigned long) override;
- virtual void didStartClosingHandshake() override;
- virtual void didClose(ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) override;
- virtual void didError() override;
-
- private:
- void initializeInternal(ExecutionContext*, const String& sourceURLAtConnection, unsigned lineNumberAtConnection);
-
- Member<Bridge> m_bridge;
- WorkerLoaderProxy& m_loaderProxy;
- Member<WebSocketChannel> m_mainWebSocketChannel;
- Member<ThreadableWebSocketChannelSyncHelper> 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();
- // sourceURLAtConnection and lineNumberAtConnection parameters may
- // be shown when the connection fails.
- void initialize(const String& sourceURLAtConnection, unsigned lineNumberAtConnection);
- bool connect(const KURL&, const String& protocol);
- void send(const String& message);
- void send(const ArrayBuffer&, unsigned byteOffset, unsigned byteLength);
- void send(PassRefPtr<BlobDataHandle>);
- unsigned long bufferedAmount();
- void close(int code, const String& reason);
- void fail(const String& reason, MessageLevel, const String& sourceURL, unsigned lineNumber);
- void disconnect();
-
- // Returns null when |disconnect| has already been called.
- WebSocketChannelClient* client() { return m_client; }
-
- void trace(Visitor*);
-
- private:
- // Returns false if shutdown event is received before method completion.
- bool waitForMethodCompletion(PassOwnPtr<ExecutionContextTask>);
-
- Member<WebSocketChannelClient> m_client;
- RefPtrWillBeMember<WorkerGlobalScope> m_workerGlobalScope;
- WorkerLoaderProxy& m_loaderProxy;
- Member<ThreadableWebSocketChannelSyncHelper> m_syncHelper;
- Member<Peer> m_peer;
- };
-
-private:
- WorkerThreadableWebSocketChannel(WorkerGlobalScope&, WebSocketChannelClient*, const String& sourceURL, unsigned lineNumber);
-
- Member<Bridge> m_bridge;
- String m_sourceURLAtConnection;
- unsigned m_lineNumberAtConnection;
-};
-
-} // namespace blink
-
-#endif // WorkerThreadableWebSocketChannel_h
« no previous file with comments | « Source/modules/websockets/WebSocketChannel.cpp ('k') | Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698