| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/common/socket_stream_dispatcher.h" | 5 #include "content/common/socket_stream_dispatcher.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/id_map.h" | 9 #include "base/id_map.h" |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 if (delegate_) | 142 if (delegate_) |
| 143 delegate_->WillOpenStream(handle_, url); | 143 delegate_->WillOpenStream(handle_, url); |
| 144 | 144 |
| 145 socket_id_ = all_bridges.Add(this); | 145 socket_id_ = all_bridges.Add(this); |
| 146 DCHECK_NE(socket_id_, content_common::kNoSocketId); | 146 DCHECK_NE(socket_id_, content_common::kNoSocketId); |
| 147 AddRef(); // Released in OnClosed(). | 147 AddRef(); // Released in OnClosed(). |
| 148 if (child_thread_->Send(new SocketStreamHostMsg_Connect(url, socket_id_))) { | 148 if (child_thread_->Send(new SocketStreamHostMsg_Connect(url, socket_id_))) { |
| 149 DVLOG(1) << "Connect socket_id=" << socket_id_; | 149 DVLOG(1) << "Connect socket_id=" << socket_id_; |
| 150 // TODO(ukai): timeout to OnConnected. | 150 // TODO(ukai): timeout to OnConnected. |
| 151 } else { | 151 } else { |
| 152 DLOG(ERROR) << "IPC SocketStream_Connect failed."; | 152 LOG(ERROR) << "IPC SocketStream_Connect failed."; |
| 153 OnClosed(); | 153 OnClosed(); |
| 154 } | 154 } |
| 155 } | 155 } |
| 156 | 156 |
| 157 void IPCWebSocketStreamHandleBridge::DoClose() { | 157 void IPCWebSocketStreamHandleBridge::DoClose() { |
| 158 child_thread_->Send(new SocketStreamHostMsg_Close(socket_id_)); | 158 child_thread_->Send(new SocketStreamHostMsg_Close(socket_id_)); |
| 159 Release(); | 159 Release(); |
| 160 } | 160 } |
| 161 | 161 |
| 162 SocketStreamDispatcher::SocketStreamDispatcher() { | 162 SocketStreamDispatcher::SocketStreamDispatcher() { |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 } | 215 } |
| 216 | 216 |
| 217 void SocketStreamDispatcher::OnClosed(int socket_id) { | 217 void SocketStreamDispatcher::OnClosed(int socket_id) { |
| 218 IPCWebSocketStreamHandleBridge* bridge = | 218 IPCWebSocketStreamHandleBridge* bridge = |
| 219 IPCWebSocketStreamHandleBridge::FromSocketId(socket_id); | 219 IPCWebSocketStreamHandleBridge::FromSocketId(socket_id); |
| 220 if (bridge) | 220 if (bridge) |
| 221 bridge->OnClosed(); | 221 bridge->OnClosed(); |
| 222 else | 222 else |
| 223 DLOG(ERROR) << "No SocketStreamHandleBridge for socket_id=" << socket_id; | 223 DLOG(ERROR) << "No SocketStreamHandleBridge for socket_id=" << socket_id; |
| 224 } | 224 } |
| OLD | NEW |