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

Unified Diff: Source/modules/websockets/WorkerWebSocketChannel.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/WorkerWebSocketChannel.h
diff --git a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h b/Source/modules/websockets/WorkerWebSocketChannel.h
similarity index 89%
rename from Source/modules/websockets/WorkerThreadableWebSocketChannel.h
rename to Source/modules/websockets/WorkerWebSocketChannel.h
index 0728634831b6bccabe6d18c75b73c131b0f564cd..a304b1326641f9b1e88682a096b74b66859cfd62 100644
--- a/Source/modules/websockets/WorkerThreadableWebSocketChannel.h
+++ b/Source/modules/websockets/WorkerWebSocketChannel.h
@@ -28,8 +28,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WorkerThreadableWebSocketChannel_h
-#define WorkerThreadableWebSocketChannel_h
+#ifndef WorkerWebSocketChannel_h
+#define WorkerWebSocketChannel_h
#include "core/frame/ConsoleTypes.h"
#include "modules/websockets/WebSocketChannel.h"
@@ -48,18 +48,18 @@ class BlobDataHandle;
class KURL;
class ExecutionContext;
class ExecutionContextTask;
-class ThreadableWebSocketChannelSyncHelper;
+class WebSocketChannelSyncHelper;
class WorkerGlobalScope;
class WorkerLoaderProxy;
-class WorkerThreadableWebSocketChannel final : public WebSocketChannel {
- WTF_MAKE_NONCOPYABLE(WorkerThreadableWebSocketChannel);
+class WorkerWebSocketChannel final : public WebSocketChannel {
+ WTF_MAKE_NONCOPYABLE(WorkerWebSocketChannel);
public:
static WebSocketChannel* create(WorkerGlobalScope& workerGlobalScope, WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber)
{
- return new WorkerThreadableWebSocketChannel(workerGlobalScope, client, sourceURL, lineNumber);
+ return new WorkerWebSocketChannel(workerGlobalScope, client, sourceURL, lineNumber);
}
- virtual ~WorkerThreadableWebSocketChannel();
+ virtual ~WorkerWebSocketChannel();
// WebSocketChannel functions.
virtual bool connect(const KURL&, const String& protocol) override;
@@ -84,7 +84,7 @@ public:
USING_GARBAGE_COLLECTED_MIXIN(Peer);
WTF_MAKE_NONCOPYABLE(Peer);
public:
- Peer(Bridge*, WorkerLoaderProxy&, ThreadableWebSocketChannelSyncHelper*);
+ Peer(Bridge*, WorkerLoaderProxy&, WebSocketChannelSyncHelper*);
virtual ~Peer();
// sourceURLAtConnection and lineNumberAtConnection parameters may
@@ -120,7 +120,7 @@ public:
Member<Bridge> m_bridge;
WorkerLoaderProxy& m_loaderProxy;
Member<WebSocketChannel> m_mainWebSocketChannel;
- Member<ThreadableWebSocketChannelSyncHelper> m_syncHelper;
+ Member<WebSocketChannelSyncHelper> m_syncHelper;
};
// Bridge for Peer. Running on the worker thread.
@@ -153,12 +153,12 @@ public:
Member<WebSocketChannelClient> m_client;
RefPtrWillBeMember<WorkerGlobalScope> m_workerGlobalScope;
WorkerLoaderProxy& m_loaderProxy;
- Member<ThreadableWebSocketChannelSyncHelper> m_syncHelper;
+ Member<WebSocketChannelSyncHelper> m_syncHelper;
Member<Peer> m_peer;
};
private:
- WorkerThreadableWebSocketChannel(WorkerGlobalScope&, WebSocketChannelClient*, const String& sourceURL, unsigned lineNumber);
+ WorkerWebSocketChannel(WorkerGlobalScope&, WebSocketChannelClient*, const String& sourceURL, unsigned lineNumber);
Member<Bridge> m_bridge;
String m_sourceURLAtConnection;
@@ -167,4 +167,4 @@ private:
} // namespace blink
-#endif // WorkerThreadableWebSocketChannel_h
+#endif // WorkerWebSocketChannel_h
« no previous file with comments | « Source/modules/websockets/WorkerThreadableWebSocketChannel.cpp ('k') | Source/modules/websockets/WorkerWebSocketChannel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698