FrameLoader: add and export isReloadLoadType()

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 43367d5e55a90ee8ace9a650edeb1c20f47f9b7d..ec480fa1fadc74b3d4916659d58c90d758deee69 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -110,15 +110,22 @@ using namespace HTMLNames;
 
 bool isBackForwardLoadType(FrameLoadType type)
 {
-    return type == FrameLoadTypeBackForward || type == FrameLoadTypeInitialHistoryLoad;
+    return type == FrameLoadTypeBackForward

[Takashi Toyoshima, 2016/07/27 10:26:49]

cl format did.

+        || type == FrameLoadTypeInitialHistoryLoad;
 }
 
-static bool needsHistoryItemRestore(FrameLoadType type)
+bool isReloadLoadType(FrameLoadType type)
 {
-    return type == FrameLoadTypeBackForward || type == FrameLoadTypeReload
+    return type == FrameLoadTypeReload
+        || type == FrameLoadTypeReloadMainResource
         || type == FrameLoadTypeReloadBypassingCache;
 }
 
+static bool needsHistoryItemRestore(FrameLoadType type)
+{
+    return type == FrameLoadTypeBackForward || isReloadLoadType(type);

[Takashi Toyoshima, 2016/07/27 10:26:48]

This also should include ReloadMainResource.

[Takashi Toyoshima, 2016/07/28 04:39:47]

This is the only change that could change behavior.
Let me investigate this.

+}
+
 // static
 ResourceRequest FrameLoader::resourceRequestFromHistoryItem(HistoryItem* item, WebCachePolicy cachePolicy)
 {
@@ -139,7 +146,7 @@ ResourceRequest FrameLoader::resourceRequestFromHistoryItem(HistoryItem* item, W
 ResourceRequest FrameLoader::resourceRequestForReload(FrameLoadType frameLoadType,
     const KURL& overrideURL, ClientRedirectPolicy clientRedirectPolicy)
 {
-    ASSERT(frameLoadType == FrameLoadTypeReload || frameLoadType == FrameLoadTypeReloadMainResource || frameLoadType == FrameLoadTypeReloadBypassingCache);
+    DCHECK(isReloadLoadType(frameLoadType));
     WebCachePolicy cachePolicy = frameLoadType == FrameLoadTypeReloadBypassingCache ? WebCachePolicy::BypassingCache : WebCachePolicy::ValidatingCacheData;
     if (!m_currentItem)
         return ResourceRequest();
@@ -865,7 +872,7 @@ static bool shouldOpenInNewWindow(Frame* targetFrame, const FrameLoadRequest& re
 
 static NavigationType determineNavigationType(FrameLoadType frameLoadType, bool isFormSubmission, bool haveEvent)
 {
-    bool isReload = frameLoadType == FrameLoadTypeReload || frameLoadType == FrameLoadTypeReloadMainResource || frameLoadType == FrameLoadTypeReloadBypassingCache;
+    bool isReload = isReloadLoadType(frameLoadType);
     bool isBackForward = isBackForwardLoadType(frameLoadType);
     if (isFormSubmission)
         return (isReload || isBackForward) ? NavigationTypeFormResubmitted : NavigationTypeFormSubmitted;