Change FrameLoadTypeReload to take FrameLoadTypeReloadMainResource's behavior

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
@@ skipping 95 matching lines @@
 namespace blink {
 
 using namespace HTMLNames;
 
 bool isBackForwardLoadType(FrameLoadType type) {
   return type == FrameLoadTypeBackForward ||
          type == FrameLoadTypeInitialHistoryLoad;
 }
 
 bool isReloadLoadType(FrameLoadType type) {
-  return type == FrameLoadTypeReload ||
-         type == FrameLoadTypeReloadMainResource ||
+  return type == FrameLoadTypeReloadMainResource ||
          type == FrameLoadTypeReloadBypassingCache;
 }
 
 static bool needsHistoryItemRestore(FrameLoadType type) {
   // FrameLoadtypeInitialHistoryLoad is intentionally excluded.
   return type == FrameLoadTypeBackForward || isReloadLoadType(type);
 }
 
 static void checkForLegacyProtocolInSubresource(
     const ResourceRequest& resourceRequest,
@@ skipping 700 matching lines @@
     return FrameLoadTypeInitialInChildFrame;
   if (!m_frame->tree().parent() && !client()->backForwardLength())
     return FrameLoadTypeStandard;
   if (m_provisionalDocumentLoader &&
       request.substituteData().failingURL() ==
           m_provisionalDocumentLoader->url() &&
       m_provisionalDocumentLoader->loadType() == FrameLoadTypeBackForward)
     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;
   // From the HTML5 spec for location.assign():
   // "If the browsing context's session history contains only one Document,
   // and that was the about:blank Document created when the browsing context
   // was created, then the navigation must be done with replacement enabled."
   if (request.replacesCurrentItem() ||
       (!m_stateMachine.committedMultipleRealLoads() &&
        equalIgnoringCase(m_frame->document()->url(), blankURL())))
     return FrameLoadTypeReplaceCurrentItem;
 
   if (request.resourceRequest().url() == m_documentLoader->urlForHistory()) {
     if (request.resourceRequest().httpMethod() == HTTPNames::POST)
       return FrameLoadTypeStandard;
     if (!request.originDocument())
       return FrameLoadTypeReloadMainResource;
     return FrameLoadTypeReplaceCurrentItem;
   }
 
   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() &&
       !request.originDocument()->frame()->hasReceivedUserGesture())
     return FrameLoadTypeReplaceCurrentItem;
 
   return FrameLoadTypeStandard;
 }
 
 bool FrameLoader::prepareRequestForThisFrame(FrameLoadRequest& request) {
@@ skipping 1029 matching lines @@
       frameLoadRequest.clientRedirect());
 
   loader->setLoadType(loadType);
   loader->setNavigationType(navigationType);
   loader->setReplacesCurrentHistoryItem(loadType ==
                                         FrameLoadTypeReplaceCurrentItem);
   return loader;
 }
 
 }  // namespace blink