diff options
Diffstat (limited to 'net/http/http_cache_transaction.cc')
-rw-r--r-- | net/http/http_cache_transaction.cc | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index f524c60..96a3622 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -314,14 +314,11 @@ const HttpResponseInfo* HttpCache::Transaction::GetResponseInfo() const { } LoadState HttpCache::Transaction::GetLoadState() const { - LoadState state = GetWriterLoadState(); - if (state != LOAD_STATE_WAITING_FOR_CACHE) - return state; - - if (cache_) - return cache_->GetLoadStateForPendingTransaction(this); - - return LOAD_STATE_IDLE; + if (network_trans_.get()) + return network_trans_->GetLoadState(); + if (entry_ || !request_) + return LOAD_STATE_IDLE; + return LOAD_STATE_WAITING_FOR_CACHE; } uint64 HttpCache::Transaction::GetUploadProgress() const { @@ -369,14 +366,6 @@ bool HttpCache::Transaction::AddTruncatedFlag() { return true; } -LoadState HttpCache::Transaction::GetWriterLoadState() const { - if (network_trans_.get()) - return network_trans_->GetLoadState(); - if (entry_ || !request_) - return LOAD_STATE_IDLE; - return LOAD_STATE_WAITING_FOR_CACHE; -} - //----------------------------------------------------------------------------- void HttpCache::Transaction::DoCallback(int rv) { |