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

Side by Side Diff: content/browser/renderer_host/socket_stream_host.cc

Issue 9677031: Bind RenderViewImpl routing_id to SocketStreamHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reflects review comments by tony and darin Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/renderer_host/socket_stream_host.h" 5 #include "content/browser/renderer_host/socket_stream_host.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/common/socket_stream.h" 8 #include "content/common/socket_stream.h"
9 #include "net/socket_stream/socket_stream_job.h" 9 #include "net/socket_stream/socket_stream_job.h"
10 10
11 static const char* kSocketIdKey = "socketId"; 11 static const char* kSocketIdKey = "socketId";
12 12
13 class SocketStreamId : public net::SocketStream::UserData { 13 class SocketStreamId : public net::SocketStream::UserData {
14 public: 14 public:
15 explicit SocketStreamId(int socket_id) : socket_id_(socket_id) {} 15 explicit SocketStreamId(int socket_id) : socket_id_(socket_id) {}
16 virtual ~SocketStreamId() {} 16 virtual ~SocketStreamId() {}
17 int socket_id() const { return socket_id_; } 17 int socket_id() const { return socket_id_; }
18 18
19 private: 19 private:
20 int socket_id_; 20 int socket_id_;
21 }; 21 };
22 22
23 SocketStreamHost::SocketStreamHost( 23 SocketStreamHost::SocketStreamHost(
24 net::SocketStream::Delegate* delegate, 24 net::SocketStream::Delegate* delegate,
25 int routing_id,
25 int socket_id) 26 int socket_id)
26 : delegate_(delegate), 27 : delegate_(delegate),
28 routing_id_(routing_id),
27 socket_id_(socket_id) { 29 socket_id_(socket_id) {
28 DCHECK_NE(socket_id_, content::kNoSocketId); 30 DCHECK_NE(socket_id_, content::kNoSocketId);
29 VLOG(1) << "SocketStreamHost: socket_id=" << socket_id_; 31 VLOG(1) << "SocketStreamHost: routing_id=" << routing_id
32 << " socket_id=" << socket_id_;
30 } 33 }
31 34
32 /* static */ 35 /* static */
33 int SocketStreamHost::SocketIdFromSocketStream(net::SocketStream* socket) { 36 int SocketStreamHost::SocketIdFromSocketStream(net::SocketStream* socket) {
34 net::SocketStream::UserData* d = socket->GetUserData(kSocketIdKey); 37 net::SocketStream::UserData* d = socket->GetUserData(kSocketIdKey);
35 if (d) { 38 if (d) {
36 SocketStreamId* socket_stream_id = static_cast<SocketStreamId*>(d); 39 SocketStreamId* socket_stream_id = static_cast<SocketStreamId*>(d);
37 return socket_stream_id->socket_id(); 40 return socket_stream_id->socket_id();
38 } 41 }
39 return content::kNoSocketId; 42 return content::kNoSocketId;
(...skipping 19 matching lines...) Expand all
59 VLOG(1) << "SocketStreamHost::SendData"; 62 VLOG(1) << "SocketStreamHost::SendData";
60 return socket_ && socket_->SendData(&data[0], data.size()); 63 return socket_ && socket_->SendData(&data[0], data.size());
61 } 64 }
62 65
63 void SocketStreamHost::Close() { 66 void SocketStreamHost::Close() {
64 VLOG(1) << "SocketStreamHost::Close"; 67 VLOG(1) << "SocketStreamHost::Close";
65 if (!socket_) 68 if (!socket_)
66 return; 69 return;
67 socket_->Close(); 70 socket_->Close();
68 } 71 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698