PlzNavigate: inform the WebFrameClient that a form will be submitted

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 28d99d964d16b432e27c8878e60e5c31b3d20acc..5a52a10660f67db1275a8cc5da1c79a2b18ed3c5 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -270,7 +270,7 @@ void FrameLoader::didExplicitOpen()
     if (Frame* parent = m_frame->tree().parent()) {
         if ((parent->isLocalFrame() && toLocalFrame(parent)->document()->loadEventStillNeeded())
             || (parent->isRemoteFrame() && parent->isLoading())) {
-            m_progressTracker->progressStarted();
+            m_progressTracker->progressStarted(true);
         }
     }
 
@@ -1305,7 +1305,7 @@ bool FrameLoader::shouldClose(bool isReload)
 
 bool FrameLoader::shouldContinueForNavigationPolicy(const ResourceRequest& request, const SubstituteData& substituteData,
     DocumentLoader* loader, ContentSecurityPolicyDisposition shouldCheckMainWorldContentSecurityPolicy,
-    NavigationType type, NavigationPolicy policy, bool replacesCurrentHistoryItem)
+    NavigationType type, NavigationPolicy policy, bool replacesCurrentHistoryItem, HTMLFormElement* form)
 {
     // Don't ask if we are loading an empty URL.
     if (request.url().isEmpty() || substituteData.isValid())
@@ -1333,8 +1333,17 @@ bool FrameLoader::shouldContinueForNavigationPolicy(const ResourceRequest& reque
     if (policy == NavigationPolicyIgnore)
         return false;
     if (policy == NavigationPolicyHandledByClient) {
-        // Mark the frame as loading since the embedder is handling the navigation.
-        m_progressTracker->progressStarted();
+        // Mark the frame as loading since the embedder is handling the
+        // navigation. However there is no need to inform the embedder that the
+        // frame is loading, since we already requested it to load the main
+        // resource.
+        m_progressTracker->progressStarted(false);

[Nate Chapin, 2015/12/08 23:18:38]

I don't particularly like the special case boolean here. Is there anything we
can do to make it unnecessary? Why is components/html_viewer/ ok receiving this
message but not PlzNavigate?

[clamy, 2015/12/11 14:50:06]

I think this is due to how the loading state is implemented in
components/html_viewer/ vs in content/. Receiving that message throws off the
load state tracking in the browser. I have tried to make it work while receiving
it, but this means ignoring any state message sent by the renderer. This in turn
stops some tests from working, since they rely on very precise behavior from the
browser that I cannot match . Honestly, the way this work on the browser side is
not good (it used to be worse though), and we can have a discussion to see if it
can be simplified. Otherwise I don't have a choice but not to send this message
to the browser.

+
+        // If this is a form submit, dispatch that a form is being submitted
+        // since the embedder is handling the navigation.
+        if (form)
+            client()->dispatchWillSubmitForm(form);
+
         return false;
     }
     if (!LocalDOMWindow::allowPopUp(*m_frame) && !UserGestureIndicator::processingUserGesture())
@@ -1355,8 +1364,11 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty
     frameLoadRequest.resourceRequest().setRequestContext(determineRequestContextFromNavigationType(navigationType));
     frameLoadRequest.resourceRequest().setFrameType(m_frame->isMainFrame() ? WebURLRequest::FrameTypeTopLevel : WebURLRequest::FrameTypeNested);
     ResourceRequest& request = frameLoadRequest.resourceRequest();
-    if (!shouldContinueForNavigationPolicy(request, frameLoadRequest.substituteData(), nullptr, frameLoadRequest.shouldCheckMainWorldContentSecurityPolicy(), navigationType, navigationPolicy, type == FrameLoadTypeReplaceCurrentItem))
+    if (!shouldContinueForNavigationPolicy(request, frameLoadRequest.substituteData(), nullptr,
+        frameLoadRequest.shouldCheckMainWorldContentSecurityPolicy(), navigationType,
+        navigationPolicy, type == FrameLoadTypeReplaceCurrentItem, frameLoadRequest.form())) {
         return;
+    }
     if (!shouldClose(navigationType == NavigationTypeReload))
         return;
 
@@ -1387,7 +1399,7 @@ void FrameLoader::startLoad(FrameLoadRequest& frameLoadRequest, FrameLoadType ty
     if (frameLoadRequest.form())
         client()->dispatchWillSubmitForm(frameLoadRequest.form());
 
-    m_progressTracker->progressStarted();
+    m_progressTracker->progressStarted(true);
     if (m_provisionalDocumentLoader->isClientRedirect())
         m_provisionalDocumentLoader->appendRedirect(m_frame->document()->url());
     m_provisionalDocumentLoader->appendRedirect(m_provisionalDocumentLoader->request().url());