diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
| commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
| tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/net/http/http_cache_transaction.cc | |
| parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) | |
| download | qtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz | |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/net/http/http_cache_transaction.cc')
| -rw-r--r-- | chromium/net/http/http_cache_transaction.cc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/chromium/net/http/http_cache_transaction.cc b/chromium/net/http/http_cache_transaction.cc index 392651ac23d..da982955724 100644 --- a/chromium/net/http/http_cache_transaction.cc +++ b/chromium/net/http/http_cache_transaction.cc @@ -34,6 +34,7 @@ #include "base/trace_event/trace_event.h" #include "base/values.h" #include "net/base/auth.h" +#include "net/base/features.h" #include "net/base/load_flags.h" #include "net/base/load_timing_info.h" #include "net/base/trace_constants.h" @@ -2029,7 +2030,8 @@ int HttpCache::Transaction::DoPartialHeadersReceived() { new_response_ = NULL; if (!partial_) { - if (entry_ && entry_->disk_entry->GetDataSize(kMetadataIndex)) { + if (entry_ && entry_->disk_entry->GetDataSize(kMetadataIndex) && + !base::FeatureList::IsEnabled(net::features::kIsolatedCodeCache)) { TransitionToState(STATE_CACHE_READ_METADATA); } else { TransitionToState(STATE_FINISH_HEADERS); @@ -2128,6 +2130,7 @@ int HttpCache::Transaction::DoCacheReadMetadata() { TRACE_EVENT0("io", "HttpCacheTransaction::DoCacheReadMetadata"); DCHECK(entry_); DCHECK(!response_.metadata.get()); + DCHECK(!base::FeatureList::IsEnabled(net::features::kIsolatedCodeCache)); TransitionToState(STATE_CACHE_READ_METADATA_COMPLETE); response_.metadata = base::MakeRefCounted<IOBufferWithSize>( @@ -2463,10 +2466,12 @@ int HttpCache::Transaction::BeginCacheRead() { if (method_ == "HEAD") FixHeadersForHead(); - if (entry_->disk_entry->GetDataSize(kMetadataIndex)) + if (entry_->disk_entry->GetDataSize(kMetadataIndex) && + !base::FeatureList::IsEnabled(net::features::kIsolatedCodeCache)) { TransitionToState(STATE_CACHE_READ_METADATA); - else + } else { TransitionToState(STATE_FINISH_HEADERS); + } return OK; } @@ -3019,10 +3024,12 @@ int HttpCache::Transaction::DoSetupEntryForRead() { if (method_ == "HEAD") FixHeadersForHead(); - if (entry_->disk_entry->GetDataSize(kMetadataIndex)) + if (entry_->disk_entry->GetDataSize(kMetadataIndex) && + !base::FeatureList::IsEnabled(net::features::kIsolatedCodeCache)) { TransitionToState(STATE_CACHE_READ_METADATA); - else + } else { TransitionToState(STATE_FINISH_HEADERS); + } return OK; } |