summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_session.cc
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 03:02:23 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-21 03:02:23 +0000
commit971746ec2d3bc209d68c3d46d1eadc68afb827af (patch)
treeb4022bc3868b5e1932b282dc61c8ee19be7aa34e /net/spdy/spdy_session.cc
parentf27bb9a6ab467be9588a382643d730c86732a1d1 (diff)
downloadchromium_src-971746ec2d3bc209d68c3d46d1eadc68afb827af.zip
chromium_src-971746ec2d3bc209d68c3d46d1eadc68afb827af.tar.gz
chromium_src-971746ec2d3bc209d68c3d46d1eadc68afb827af.tar.bz2
Remove SpdyHttpStream dependency in SpdySession
BUG=none TEST=none Review URL: http://codereview.chromium.org/3035010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session.cc')
-rw-r--r--net/spdy/spdy_session.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index a45289f..06ba7d5 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -295,8 +295,7 @@ int SpdySession::CreateStream(
RequestPriority priority,
scoped_refptr<SpdyStream>* spdy_stream,
const BoundNetLog& stream_net_log,
- CompletionCallback* callback,
- const SpdyHttpStream* spdy_http_stream) {
+ CompletionCallback* callback) {
if (!max_concurrent_streams_ ||
active_streams_.size() < max_concurrent_streams_) {
return CreateStreamImpl(url, priority, spdy_stream, stream_net_log);
@@ -304,7 +303,7 @@ int SpdySession::CreateStream(
create_stream_queues_[priority].push(
PendingCreateStream(url, priority, spdy_stream,
- stream_net_log, callback, spdy_http_stream));
+ stream_net_log, callback));
return ERR_IO_PENDING;
}
@@ -331,13 +330,13 @@ void SpdySession::ProcessPendingCreateStreams() {
}
void SpdySession::CancelPendingCreateStreams(
- const SpdyHttpStream *const spdy_http_stream) {
+ const scoped_refptr<SpdyStream>* spdy_stream) {
for (int i = 0;i < NUM_PRIORITIES;++i) {
PendingCreateStreamQueue tmp;
// Make a copy removing this trans
while (!create_stream_queues_[i].empty()) {
PendingCreateStream& pending_create = create_stream_queues_[i].front();
- if (pending_create.spdy_http_stream != spdy_http_stream)
+ if (pending_create.spdy_stream != spdy_stream)
tmp.push(pending_create);
create_stream_queues_[i].pop();
}