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

Unified Diff: Source/core/loader/cache/CachedResourceLoader.cpp

Issue 14610003: Revert "Remove FrameLoadTypeSame" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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 | « Source/core/loader/HistoryController.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/cache/CachedResourceLoader.cpp
diff --git a/Source/core/loader/cache/CachedResourceLoader.cpp b/Source/core/loader/cache/CachedResourceLoader.cpp
index 42f9e59ef48d709d493364d1481f8b1eabcc27b7..ca469a639eae7a4780e0670179f57871bd82c52c 100644
--- a/Source/core/loader/cache/CachedResourceLoader.cpp
+++ b/Source/core/loader/cache/CachedResourceLoader.cpp
@@ -507,7 +507,7 @@ ResourceRequestCachePolicy CachedResourceLoader::resourceRequestCachePolicy(cons
return ReturnCacheDataDontLoad;
if (!m_documentLoader->overrideEncoding().isEmpty() || frameLoadType == FrameLoadTypeBackForward)
return ReturnCacheDataElseLoad;
- if (isReload || request.isConditional())
+ if (isReload || frameLoadType == FrameLoadTypeSame || request.isConditional())
return ReloadIgnoringCacheData;
return UseProtocolCachePolicy;
}
« no previous file with comments | « Source/core/loader/HistoryController.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698