Cleanup blink-side PlzNavigate logic

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 3296 matching lines @@
   // TODO(creis): Look into cleaning this up.
   return WebHistoryItem();
 }
 
 void RenderFrameImpl::willSendSubmitEvent(const blink::WebFormElement& form) {
   for (auto& observer : observers_)
     observer.WillSendSubmitEvent(form);
 }
 
 void RenderFrameImpl::willSubmitForm(const blink::WebFormElement& form) {
-  // With PlzNavigate-enabled, this will be called before a DataSource has been
-  // set-up.
-  // TODO(clamy): make sure the internal state is properly updated at some
-  // point in the navigation.
-  if (!IsBrowserSideNavigationEnabled() && !!frame_->provisionalDataSource()) {
     DocumentState* document_state =
         DocumentState::FromDataSource(frame_->provisionalDataSource());
     NavigationStateImpl* navigation_state =
         static_cast<NavigationStateImpl*>(document_state->navigation_state());
     InternalDocumentStateData* internal_data =
         InternalDocumentStateData::FromDocumentState(document_state);
 
     if (ui::PageTransitionCoreTypeIs(navigation_state->GetTransitionType(),
                                      ui::PAGE_TRANSITION_LINK)) {
       navigation_state->set_transition_type(ui::PAGE_TRANSITION_FORM_SUBMIT);
     }
 
     // Save these to be processed when the ensuing navigation is committed.
     WebSearchableFormData web_searchable_form_data(form);
     internal_data->set_searchable_form_url(web_searchable_form_data.url());
     internal_data->set_searchable_form_encoding(
         web_searchable_form_data.encoding().utf8());
-  }
 
   for (auto& observer : observers_)
     observer.WillSubmitForm(form);
 }
 
 void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame,
                                           blink::WebDataSource* datasource) {
   DCHECK(!frame_ || frame_ == frame);
 
   bool content_initiated = !pending_navigation_params_.get();
@@ skipping 1877 matching lines @@
   // TODO(clamy): see if initial commits in subframes should be handled
   // separately.
   bool replace = is_reload || common_params.url == GetLoadingUrl() ||
                  common_params.should_replace_current_entry;
   std::unique_ptr<HistoryEntry> history_entry;
   if (request_params.page_state.IsValid())
     history_entry = PageStateToHistoryEntry(request_params.page_state);
 
   // For renderer initiated navigations, we send out a didFailProvisionalLoad()
   // notification.
-  if (request_params.nav_entry_id == 0)
-    didFailProvisionalLoad(frame_, error, blink::WebStandardCommit);
-  LoadNavigationErrorPage(failed_request, error, replace, history_entry.get());
+  bool had_provisional_data_source = frame_->provisionalDataSource();
+  if (request_params.nav_entry_id == 0) {
+    didFailProvisionalLoad(
+        frame_, error,
+        replace ? blink::WebHistoryInertCommit : blink::WebStandardCommit);
+  }
+
+  // If we didn't call didFailProvisionalLoad or there wasn't a
+  // provisionalDataSource(), LoadNavigationErrorPage wasn't called, so do it
+  // now.
+  if (request_params.nav_entry_id != 0 || !had_provisional_data_source) {
+    LoadNavigationErrorPage(failed_request, error, replace,
+                            history_entry.get());
+  }
+
   browser_side_navigation_pending_ = false;
 }
 
 WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
     const NavigationPolicyInfo& info) {
   // A content initiated navigation may have originated from a link-click,
   // script, drag-n-drop operation, etc.
   // info.extraData is only non-null if this is a redirect. Use the extraData
   // initiation information for redirects, and check pending_navigation_params_
   // otherwise.
@@ skipping 64 matching lines @@
     if (should_ask_browser) {
       // Don't do this if |info| also says it is a client redirect, in which
       // case JavaScript on the page is trying to interrupt the history
       // navigation.
       if (!info.isClientRedirect) {
         OpenURL(url, IsHttpPost(info.urlRequest),
                 GetRequestBodyForWebURLRequest(info.urlRequest),
                 GetWebURLRequestHeaders(info.urlRequest), referrer,
                 info.defaultPolicy, info.replacesCurrentHistoryItem, true);
         // Suppress the load in Blink but mark the frame as loading.
-        return blink::WebNavigationPolicyHandledByClient;
+        return blink::WebNavigationPolicyHandledByClientForInitialHistory;
       } else {
         // Client redirects during an initial history load should attempt to
         // cancel the history navigation.  They will create a provisional
         // document loader, causing the history load to be ignored in
         // NavigateInternal, and this IPC will try to cancel any cross-process
         // history load.
         Send(new FrameHostMsg_CancelInitialHistoryLoad(routing_id_));
       }
     }
   }
@@ skipping 1526 matching lines @@
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
 }  // namespace content