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

Unified Diff: Source/platform/network/SocketStreamHandle.cpp

Issue 304113002: Pass render frame ID to WebSocketBridge (Blink side) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed #2 Created 6 years, 7 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
« no previous file with comments | « Source/platform/network/SocketStreamHandle.h ('k') | Source/platform/network/SocketStreamHandleClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/network/SocketStreamHandle.cpp
diff --git a/Source/platform/network/SocketStreamHandle.cpp b/Source/platform/network/SocketStreamHandle.cpp
index 94bba1d4d94bb9bcd485c1cf2800a6b9f141eb5e..88636faa9666a8195a40bb66be0d242926b0bbb0 100644
--- a/Source/platform/network/SocketStreamHandle.cpp
+++ b/Source/platform/network/SocketStreamHandle.cpp
@@ -47,6 +47,7 @@ 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)
{
@@ -59,12 +60,9 @@ SocketStreamHandleInternal::~SocketStreamHandleInternal()
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);
}
@@ -163,13 +161,16 @@ void SocketStreamHandleInternal::didFail(blink::WebSocketStreamHandle* socketHan
// 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()
« no previous file with comments | « Source/platform/network/SocketStreamHandle.h ('k') | Source/platform/network/SocketStreamHandleClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698