Merge 113138

Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp

Index: Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp
===================================================================
--- Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp	(revision 115611)
+++ Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp	(working copy)
@@ -44,6 +44,7 @@
 ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper(ScriptExecutionContext* context, WebSocketChannelClient* client)
     : m_context(context)
     , m_client(client)
+    , m_peer(0)
     , m_syncMethodDone(true)
     , m_useHixie76Protocol(true)
     , m_sendRequestResult(ThreadableWebSocketChannel::SendFail)
@@ -72,16 +73,28 @@
     return m_syncMethodDone;
 }
 
-bool ThreadableWebSocketChannelClientWrapper::useHixie76Protocol() const
+WorkerThreadableWebSocketChannel::Peer* ThreadableWebSocketChannelClientWrapper::peer() const
 {
-    return m_useHixie76Protocol;
+    return m_peer;
 }
 
-void ThreadableWebSocketChannelClientWrapper::setUseHixie76Protocol(bool useHixie76Protocol)
+void ThreadableWebSocketChannelClientWrapper::didCreateWebSocketChannel(WorkerThreadableWebSocketChannel::Peer* peer, bool useHixie76Protocol)
 {
+    m_peer = peer;
     m_useHixie76Protocol = useHixie76Protocol;
+    m_syncMethodDone = true;
 }
 
+void ThreadableWebSocketChannelClientWrapper::clearPeer()
+{
+    m_peer = 0;
+}
+
+bool ThreadableWebSocketChannelClientWrapper::useHixie76Protocol() const
+{
+    return m_useHixie76Protocol;
+}
+
 String ThreadableWebSocketChannelClientWrapper::subprotocol() const
 {
     if (m_subprotocol.isEmpty())