diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/net/http/http_cache_transaction.cc | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
| download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/net/http/http_cache_transaction.cc')
| -rw-r--r-- | chromium/net/http/http_cache_transaction.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/net/http/http_cache_transaction.cc b/chromium/net/http/http_cache_transaction.cc index 24002d75215..ede3541aa40 100644 --- a/chromium/net/http/http_cache_transaction.cc +++ b/chromium/net/http/http_cache_transaction.cc @@ -577,6 +577,11 @@ void HttpCache::Transaction::GetConnectionAttempts( old_connection_attempts_.end()); } +size_t HttpCache::Transaction::EstimateMemoryUsage() const { + // TODO(xunjieli): Consider improving the coverage. crbug.com/669108. + return 0; +} + //----------------------------------------------------------------------------- // A few common patterns: (Foo* means Foo -> FooComplete) @@ -1160,6 +1165,9 @@ int HttpCache::Transaction::DoAddToEntryComplete(int result) { } if (result == ERR_CACHE_LOCK_TIMEOUT) { + if (mode_ == READ) + return ERR_CACHE_MISS; + // The cache is busy, bypass it for this transaction. mode_ = NONE; next_state_ = STATE_SEND_REQUEST; |