Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior

third_party/WebKit/Source/core/loader/FrameLoader.cpp

Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index f108a6c88c12da44aaeccb5f074de389cf29677e..308258ee65426332413e9944d3454262aeeba8c6 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -113,8 +113,7 @@ bool isBackForwardLoadType(FrameLoadType type) {
 }
 
 bool isReloadLoadType(FrameLoadType type) {
-  return type == FrameLoadTypeReload ||
-         type == FrameLoadTypeReloadMainResource ||
+  return type == FrameLoadTypeReloadMainResource ||
          type == FrameLoadTypeReloadBypassingCache;
 }
 
@@ -835,7 +834,7 @@ FrameLoadType FrameLoader::determineFrameLoadType(
     return FrameLoadTypeBackForward;
   if (request.resourceRequest().getCachePolicy() ==
       WebCachePolicy::ValidatingCacheData)
-    return FrameLoadTypeReload;
+    return FrameLoadTypeReloadMainResource;

[Takashi Toyoshima, 2017/03/23 08:45:42]

non-mechanical. I think reviewers can review this behavior change.

   if (request.resourceRequest().getCachePolicy() ==
       WebCachePolicy::BypassingCache)
     return FrameLoadTypeReloadBypassingCache;
@@ -858,8 +857,8 @@ FrameLoadType FrameLoader::determineFrameLoadType(
 
   if (request.substituteData().failingURL() ==
           m_documentLoader->urlForHistory() &&
-      m_documentLoader->loadType() == FrameLoadTypeReload)
-    return FrameLoadTypeReload;
+      m_documentLoader->loadType() == FrameLoadTypeReloadMainResource)

[Takashi Toyoshima, 2017/03/23 08:45:42]

non-mechanical. I think reviewers can review this behavior change.

+    return FrameLoadTypeReloadMainResource;
 
   if (m_frame->settings()->getHistoryEntryRequiresUserGesture() &&
       request.originDocument() &&