Commit 48b4c5b0 authored by bnc's avatar bnc Committed by Commit bot

Remove unused max_concurrent_streams_limit_ member.

Remove HttpNetworkSession::Params::spdy_max_concurrent_streams_limit,
SpdySessionPool::max_concurrent_streams_limit_, and
SpdySession::max_concurrent_streams_limit_ members.  Note that
SETTINGS_MAX_CONCURRENT_STREAMS is still limited by kMaxConcurrentStreamLimit,
currently 256.

BUG=481005

Review URL: https://codereview.chromium.org/1112093002

Cr-Commit-Position: refs/heads/master@{#327503}
parent ade50cd0
...@@ -80,7 +80,6 @@ HttpNetworkSession::Params::Params() ...@@ -80,7 +80,6 @@ HttpNetworkSession::Params::Params()
spdy_session_max_recv_window_size(kSpdySessionMaxRecvWindowSize), spdy_session_max_recv_window_size(kSpdySessionMaxRecvWindowSize),
spdy_stream_max_recv_window_size(kSpdyStreamMaxRecvWindowSize), spdy_stream_max_recv_window_size(kSpdyStreamMaxRecvWindowSize),
spdy_initial_max_concurrent_streams(0), spdy_initial_max_concurrent_streams(0),
spdy_max_concurrent_streams_limit(0),
time_func(&base::TimeTicks::Now), time_func(&base::TimeTicks::Now),
use_alternate_protocols(false), use_alternate_protocols(false),
alternative_service_probability_threshold(1), alternative_service_probability_threshold(1),
...@@ -156,7 +155,6 @@ HttpNetworkSession::HttpNetworkSession(const Params& params) ...@@ -156,7 +155,6 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
params.spdy_session_max_recv_window_size, params.spdy_session_max_recv_window_size,
params.spdy_stream_max_recv_window_size, params.spdy_stream_max_recv_window_size,
params.spdy_initial_max_concurrent_streams, params.spdy_initial_max_concurrent_streams,
params.spdy_max_concurrent_streams_limit,
params.time_func, params.time_func,
params.trusted_spdy_proxy), params.trusted_spdy_proxy),
http_stream_factory_(new HttpStreamFactoryImpl(this, false)), http_stream_factory_(new HttpStreamFactoryImpl(this, false)),
......
...@@ -96,7 +96,6 @@ class NET_EXPORT HttpNetworkSession ...@@ -96,7 +96,6 @@ class NET_EXPORT HttpNetworkSession
size_t spdy_session_max_recv_window_size; size_t spdy_session_max_recv_window_size;
size_t spdy_stream_max_recv_window_size; size_t spdy_stream_max_recv_window_size;
size_t spdy_initial_max_concurrent_streams; size_t spdy_initial_max_concurrent_streams;
size_t spdy_max_concurrent_streams_limit;
SpdySessionPool::TimeFunc time_func; SpdySessionPool::TimeFunc time_func;
std::string trusted_spdy_proxy; std::string trusted_spdy_proxy;
// URLs to exclude from forced SPDY. // URLs to exclude from forced SPDY.
......
...@@ -615,7 +615,6 @@ SpdySession::SpdySession( ...@@ -615,7 +615,6 @@ SpdySession::SpdySession(
size_t session_max_recv_window_size, size_t session_max_recv_window_size,
size_t stream_max_recv_window_size, size_t stream_max_recv_window_size,
size_t initial_max_concurrent_streams, size_t initial_max_concurrent_streams,
size_t max_concurrent_streams_limit,
TimeFunc time_func, TimeFunc time_func,
const HostPortPair& trusted_spdy_proxy, const HostPortPair& trusted_spdy_proxy,
NetLog* net_log) NetLog* net_log)
...@@ -640,9 +639,6 @@ SpdySession::SpdySession( ...@@ -640,9 +639,6 @@ SpdySession::SpdySession(
max_concurrent_streams_(initial_max_concurrent_streams == 0 max_concurrent_streams_(initial_max_concurrent_streams == 0
? kInitialMaxConcurrentStreams ? kInitialMaxConcurrentStreams
: initial_max_concurrent_streams), : initial_max_concurrent_streams),
max_concurrent_streams_limit_(max_concurrent_streams_limit == 0
? kMaxConcurrentStreamLimit
: max_concurrent_streams_limit),
max_concurrent_pushed_streams_(kMaxConcurrentPushedStreams), max_concurrent_pushed_streams_(kMaxConcurrentPushedStreams),
streams_initiated_count_(0), streams_initiated_count_(0),
streams_pushed_count_(0), streams_pushed_count_(0),
......
...@@ -245,7 +245,6 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface, ...@@ -245,7 +245,6 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
size_t session_max_recv_window_size, size_t session_max_recv_window_size,
size_t stream_max_recv_window_size, size_t stream_max_recv_window_size,
size_t initial_max_concurrent_streams, size_t initial_max_concurrent_streams,
size_t max_concurrent_streams_limit,
TimeFunc time_func, TimeFunc time_func,
const HostPortPair& trusted_spdy_proxy, const HostPortPair& trusted_spdy_proxy,
NetLog* net_log); NetLog* net_log);
...@@ -1064,7 +1063,6 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface, ...@@ -1064,7 +1063,6 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
// Limits // Limits
size_t max_concurrent_streams_; // 0 if no limit size_t max_concurrent_streams_; // 0 if no limit
size_t max_concurrent_streams_limit_;
size_t max_concurrent_pushed_streams_; size_t max_concurrent_pushed_streams_;
// Some statistics counters for the session. // Some statistics counters for the session.
......
...@@ -39,7 +39,6 @@ SpdySessionPool::SpdySessionPool( ...@@ -39,7 +39,6 @@ SpdySessionPool::SpdySessionPool(
size_t session_max_recv_window_size, size_t session_max_recv_window_size,
size_t stream_max_recv_window_size, size_t stream_max_recv_window_size,
size_t initial_max_concurrent_streams, size_t initial_max_concurrent_streams,
size_t max_concurrent_streams_limit,
SpdySessionPool::TimeFunc time_func, SpdySessionPool::TimeFunc time_func,
const std::string& trusted_spdy_proxy) const std::string& trusted_spdy_proxy)
: http_server_properties_(http_server_properties), : http_server_properties_(http_server_properties),
...@@ -58,7 +57,6 @@ SpdySessionPool::SpdySessionPool( ...@@ -58,7 +57,6 @@ SpdySessionPool::SpdySessionPool(
session_max_recv_window_size_(session_max_recv_window_size), session_max_recv_window_size_(session_max_recv_window_size),
stream_max_recv_window_size_(stream_max_recv_window_size), stream_max_recv_window_size_(stream_max_recv_window_size),
initial_max_concurrent_streams_(initial_max_concurrent_streams), initial_max_concurrent_streams_(initial_max_concurrent_streams),
max_concurrent_streams_limit_(max_concurrent_streams_limit),
time_func_(time_func), time_func_(time_func),
trusted_spdy_proxy_(HostPortPair::FromString(trusted_spdy_proxy)) { trusted_spdy_proxy_(HostPortPair::FromString(trusted_spdy_proxy)) {
DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion && DCHECK(default_protocol_ >= kProtoSPDYMinimumVersion &&
...@@ -101,9 +99,8 @@ base::WeakPtr<SpdySession> SpdySessionPool::CreateAvailableSessionFromSocket( ...@@ -101,9 +99,8 @@ base::WeakPtr<SpdySession> SpdySessionPool::CreateAvailableSessionFromSocket(
verify_domain_authentication_, enable_sending_initial_data_, verify_domain_authentication_, enable_sending_initial_data_,
enable_compression_, enable_ping_based_connection_checking_, enable_compression_, enable_ping_based_connection_checking_,
default_protocol_, session_max_recv_window_size_, default_protocol_, session_max_recv_window_size_,
stream_max_recv_window_size_, initial_max_concurrent_streams_, stream_max_recv_window_size_, initial_max_concurrent_streams_, time_func_,
max_concurrent_streams_limit_, time_func_, trusted_spdy_proxy_, trusted_spdy_proxy_, net_log.net_log()));
net_log.net_log()));
new_session->InitializeWithSocket( new_session->InitializeWithSocket(
connection.Pass(), this, is_secure, certificate_error_code); connection.Pass(), this, is_secure, certificate_error_code);
......
...@@ -58,7 +58,6 @@ class NET_EXPORT SpdySessionPool ...@@ -58,7 +58,6 @@ class NET_EXPORT SpdySessionPool
size_t session_max_recv_window_size, size_t session_max_recv_window_size,
size_t stream_max_recv_window_size, size_t stream_max_recv_window_size,
size_t initial_max_concurrent_streams, size_t initial_max_concurrent_streams,
size_t max_concurrent_streams_limit,
SpdySessionPool::TimeFunc time_func, SpdySessionPool::TimeFunc time_func,
const std::string& trusted_spdy_proxy); const std::string& trusted_spdy_proxy);
~SpdySessionPool() override; ~SpdySessionPool() override;
...@@ -216,7 +215,6 @@ class NET_EXPORT SpdySessionPool ...@@ -216,7 +215,6 @@ class NET_EXPORT SpdySessionPool
size_t session_max_recv_window_size_; size_t session_max_recv_window_size_;
size_t stream_max_recv_window_size_; size_t stream_max_recv_window_size_;
size_t initial_max_concurrent_streams_; size_t initial_max_concurrent_streams_;
size_t max_concurrent_streams_limit_;
TimeFunc time_func_; TimeFunc time_func_;
// This SPDY proxy is allowed to push resources from origins that are // This SPDY proxy is allowed to push resources from origins that are
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment