Reland "Fix form resubmissions happening silently."

Source/core/loader/NavigationAction.cpp

Index: Source/core/loader/NavigationAction.cpp
diff --git a/Source/core/loader/NavigationAction.cpp b/Source/core/loader/NavigationAction.cpp
index 603f40abb20e9c6e791ff91400afc849303d8290..ffabc57d84a24d700eaa288d9e857592cf82da4a 100644
--- a/Source/core/loader/NavigationAction.cpp
+++ b/Source/core/loader/NavigationAction.cpp
@@ -37,13 +37,14 @@ namespace WebCore {
 static NavigationType navigationType(FrameLoadType frameLoadType, bool isFormSubmission, bool haveEvent)
 {
     bool isReload = frameLoadType == FrameLoadTypeReload || frameLoadType == FrameLoadTypeReloadFromOrigin;
+    bool isBackForward = isBackForwardLoadType(frameLoadType);
     if (isFormSubmission)
-        return isReload ? NavigationTypeFormResubmitted : NavigationTypeFormSubmitted;
+        return (isReload || isBackForward) ? NavigationTypeFormResubmitted : NavigationTypeFormSubmitted;
     if (haveEvent)
         return NavigationTypeLinkClicked;
     if (isReload)
         return NavigationTypeReload;
-    if (isBackForwardLoadType(frameLoadType))
+    if (isBackForward)
         return NavigationTypeBackForward;
     return NavigationTypeOther;
 }