Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: ios/net/crn_http_protocol_handler.mm

Issue 2398613002: [HttpCache] LOAD_ONLY_FROM_CACHE should not imply LOAD_PREFERRING_CACHE (Closed)
Patch Set: Always check vary Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | net/base/load_flags_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/net/crn_http_protocol_handler.mm
diff --git a/ios/net/crn_http_protocol_handler.mm b/ios/net/crn_http_protocol_handler.mm
index 9c65ef66df562a134192f1572e1a4fee82fb99de..0555ab7c45bfe0d22b84e0dced9d2ab923c12511 100644
--- a/ios/net/crn_http_protocol_handler.mm
+++ b/ios/net/crn_http_protocol_handler.mm
@@ -602,13 +602,13 @@ void HttpProtocolHandlerCore::SetLoadFlags() {
load_flags |= LOAD_VALIDATE_CACHE;
break;
case RequestTracker::CACHE_HISTORY:
- load_flags |= LOAD_PREFERRING_CACHE;
+ load_flags |= LOAD_SKIP_CACHE_VALIDATION;
break;
case RequestTracker::CACHE_BYPASS:
load_flags |= LOAD_DISABLE_CACHE | LOAD_BYPASS_CACHE;
break;
case RequestTracker::CACHE_ONLY:
- load_flags |= LOAD_ONLY_FROM_CACHE;
+ load_flags |= LOAD_ONLY_FROM_CACHE | LOAD_SKIP_CACHE_VALIDATION;
break;
case RequestTracker::CACHE_NORMAL:
// Do nothing, normal load.
@@ -622,10 +622,10 @@ void HttpProtocolHandlerCore::SetLoadFlags() {
load_flags |= LOAD_DISABLE_CACHE;
break;
case NSURLRequestReturnCacheDataElseLoad:
- load_flags |= LOAD_PREFERRING_CACHE;
+ load_flags |= LOAD_SKIP_CACHE_VALIDATION;
break;
case NSURLRequestReturnCacheDataDontLoad:
- load_flags |= LOAD_ONLY_FROM_CACHE;
+ load_flags |= LOAD_ONLY_FROM_CACHE | LOAD_SKIP_CACHE_VALIDATION;
break;
case NSURLRequestReloadRevalidatingCacheData:
load_flags |= LOAD_VALIDATE_CACHE;
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | net/base/load_flags_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698