Chromium Code Reviews (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

Unified Diff: Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h

Issue 10270006: Merge 113138 (Closed) Base URL:
Patch Set: Created 8 years, 8 months 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/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h
--- Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h (revision 115611)
+++ Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h (working copy)
@@ -37,6 +37,7 @@
#include "ScriptExecutionContext.h"
#include "ThreadableWebSocketChannel.h"
#include "WebSocketChannelClient.h"
+#include "WorkerThreadableWebSocketChannel.h"
#include <wtf/Forward.h>
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -56,10 +57,13 @@
void setSyncMethodDone();
bool syncMethodDone() const;
+ WorkerThreadableWebSocketChannel::Peer* peer() const;
+ void didCreateWebSocketChannel(WorkerThreadableWebSocketChannel::Peer*, bool useHixie76Protocol);
+ void clearPeer();
// The value of useHixie76Protocol flag is cachable; this value is saved after WebSocketChannel (on the main
// thread) is constructed.
bool useHixie76Protocol() const;
- void setUseHixie76Protocol(bool);
// Subprotocol and extensions are cached too. Will be available when didConnect() callback is invoked.
String subprotocol() const;
@@ -100,6 +104,7 @@
ScriptExecutionContext* m_context;
WebSocketChannelClient* m_client;
+ WorkerThreadableWebSocketChannel::Peer* m_peer;
bool m_syncMethodDone;
bool m_useHixie76Protocol;
// ThreadSafeRefCounted must not have String member variables.

Powered by Google App Engine
This is Rietveld 408576698