| Index: net/http/http_pipelined_host_impl.cc
|
| diff --git a/net/http/http_pipelined_host_impl.cc b/net/http/http_pipelined_host_impl.cc
|
| index 2a41ca41a8520c24c6f3e1f23da466f5464fe780..8f62e20107ae86bf3e4a3d7508a6b3cfd793f44f 100644
|
| --- a/net/http/http_pipelined_host_impl.cc
|
| +++ b/net/http/http_pipelined_host_impl.cc
|
| @@ -43,9 +43,15 @@ HttpPipelinedStream* HttpPipelinedHostImpl::CreateStreamOnNewPipeline(
|
| if (capability_ == PIPELINE_INCAPABLE) {
|
| return NULL;
|
| }
|
| - HttpPipelinedConnection* pipeline = factory_->CreateNewPipeline(
|
| - connection, this, key_.origin(), used_ssl_config, used_proxy_info,
|
| - net_log, was_npn_negotiated, protocol_negotiated);
|
| + HttpPipelinedConnection* pipeline =
|
| + factory_->CreateNewPipeline(connection,
|
| + this,
|
| + key_.origin(),
|
| + used_ssl_config,
|
| + used_proxy_info,
|
| + net_log,
|
| + was_npn_negotiated,
|
| + protocol_negotiated);
|
| PipelineInfo info;
|
| pipelines_.insert(std::make_pair(pipeline, info));
|
| return pipeline->CreateNewStream();
|
| @@ -54,7 +60,8 @@ HttpPipelinedStream* HttpPipelinedHostImpl::CreateStreamOnNewPipeline(
|
| HttpPipelinedStream* HttpPipelinedHostImpl::CreateStreamOnExistingPipeline() {
|
| HttpPipelinedConnection* available_pipeline = NULL;
|
| for (PipelineInfoMap::iterator it = pipelines_.begin();
|
| - it != pipelines_.end(); ++it) {
|
| + it != pipelines_.end();
|
| + ++it) {
|
| if (CanPipelineAcceptRequests(it->first) &&
|
| (!available_pipeline ||
|
| it->first->depth() < available_pipeline->depth())) {
|
| @@ -69,7 +76,8 @@ HttpPipelinedStream* HttpPipelinedHostImpl::CreateStreamOnExistingPipeline() {
|
|
|
| bool HttpPipelinedHostImpl::IsExistingPipelineAvailable() const {
|
| for (PipelineInfoMap::const_iterator it = pipelines_.begin();
|
| - it != pipelines_.end(); ++it) {
|
| + it != pipelines_.end();
|
| + ++it) {
|
| if (CanPipelineAcceptRequests(it->first)) {
|
| return true;
|
| }
|
| @@ -168,10 +176,8 @@ int HttpPipelinedHostImpl::GetPipelineCapacity() const {
|
|
|
| bool HttpPipelinedHostImpl::CanPipelineAcceptRequests(
|
| HttpPipelinedConnection* pipeline) const {
|
| - return capability_ != PIPELINE_INCAPABLE &&
|
| - pipeline->usable() &&
|
| - pipeline->active() &&
|
| - pipeline->depth() < GetPipelineCapacity();
|
| + return capability_ != PIPELINE_INCAPABLE && pipeline->usable() &&
|
| + pipeline->active() && pipeline->depth() < GetPipelineCapacity();
|
| }
|
|
|
| void HttpPipelinedHostImpl::NotifyAllPipelinesHaveCapacity() {
|
| @@ -179,7 +185,8 @@ void HttpPipelinedHostImpl::NotifyAllPipelinesHaveCapacity() {
|
| // deleting and removing entries from |pipelines_|.
|
| PipelineInfoMap pipelines_to_notify = pipelines_;
|
| for (PipelineInfoMap::iterator it = pipelines_to_notify.begin();
|
| - it != pipelines_to_notify.end(); ++it) {
|
| + it != pipelines_to_notify.end();
|
| + ++it) {
|
| if (pipelines_.find(it->first) != pipelines_.end()) {
|
| OnPipelineHasCapacity(it->first);
|
| }
|
| @@ -189,7 +196,8 @@ void HttpPipelinedHostImpl::NotifyAllPipelinesHaveCapacity() {
|
| base::Value* HttpPipelinedHostImpl::PipelineInfoToValue() const {
|
| base::ListValue* list_value = new base::ListValue();
|
| for (PipelineInfoMap::const_iterator it = pipelines_.begin();
|
| - it != pipelines_.end(); ++it) {
|
| + it != pipelines_.end();
|
| + ++it) {
|
| base::DictionaryValue* pipeline_dict = new base::DictionaryValue;
|
| pipeline_dict->SetString("host", key_.origin().ToString());
|
| pipeline_dict->SetBoolean("forced", false);
|
| @@ -203,8 +211,7 @@ base::Value* HttpPipelinedHostImpl::PipelineInfoToValue() const {
|
| return list_value;
|
| }
|
|
|
| -HttpPipelinedHostImpl::PipelineInfo::PipelineInfo()
|
| - : num_successes(0) {
|
| +HttpPipelinedHostImpl::PipelineInfo::PipelineInfo() : num_successes(0) {
|
| }
|
|
|
| } // namespace net
|
|
|