Pass render frame ID to WebSocketBridge (Blink side)

Source/platform/network/SocketStreamHandle.cpp

 /*
  * Copyright (C) 2009, 2011, 2012 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 29 matching lines @@
 #include "public/platform/WebSocketStreamError.h"
 #include "public/platform/WebSocketStreamHandle.h"
 #include "wtf/PassOwnPtr.h"
 
 namespace WebCore {
 
 static const unsigned bufferSize = 100 * 1024 * 1024;
 
 SocketStreamHandleInternal::SocketStreamHandleInternal(SocketStreamHandle* handle)
     : m_handle(handle)
+    , m_socket(adoptPtr(blink::Platform::current()->createSocketStreamHandle()))
     , m_maxPendingSendAllowed(0)
     , m_pendingAmountSent(0)
 {
 }
 
 SocketStreamHandleInternal::~SocketStreamHandleInternal()
 {
     m_handle = 0;
 }
 
 void SocketStreamHandleInternal::connect(const KURL& url)
 {
-    m_socket = adoptPtr(blink::Platform::current()->createSocketStreamHandle());
     WTF_LOG(Network, "SocketStreamHandleInternal %p connect()", this);
+
     ASSERT(m_socket);
-    ASSERT(m_handle);
-    if (m_handle->m_client)
-        m_handle->m_client->willOpenSocketStream(m_handle);
     m_socket->connect(url, this);
 }
 
 int SocketStreamHandleInternal::send(const char* data, int len)
 {
     WTF_LOG(Network, "SocketStreamHandleInternal %p send() len=%d", this, len);
     // FIXME: |m_socket| should not be null here, but it seems that there is the
     // case. We should figure out such a path and fix it rather than checking
     // null here.
     if (!m_socket) {
@@ skipping 78 matching lines @@
     WTF_LOG(Network, "SocketStreamHandleInternal %p didFail()", this);
     if (m_handle && m_socket) {
         ASSERT(socketHandle == m_socket.get());
         if (m_handle->m_client)
             m_handle->m_client->didFailSocketStream(m_handle, *(PassRefPtr<SocketStreamError>(err)));
     }
 }
 
 // SocketStreamHandle ----------------------------------------------------------
 
-SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient* client)
-    : m_url(url)
-    , m_client(client)
+SocketStreamHandle::SocketStreamHandle(SocketStreamHandleClient* client)
+    : m_client(client)
     , m_state(Connecting)
 {
     m_internal = SocketStreamHandleInternal::create(this);
-    m_internal->connect(m_url);
+}
+
+void SocketStreamHandle::connect(const KURL& url)
+{
+    m_internal->connect(url);
 }
 
 SocketStreamHandle::~SocketStreamHandle()
 {
     setClient(0);
     m_internal.clear();
 }
 
 SocketStreamHandle::SocketStreamState SocketStreamHandle::state() const
 {
@@ skipping 88 matching lines @@
     return m_internal->send(buf, len);
 }
 
 void SocketStreamHandle::closeInternal()
 {
     if (m_internal)
         m_internal->close();
 }
 
 } // namespace WebCore