Drop replacesCurrentHistoryItem, NavigationType

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 904 matching lines @@
                                               const WebURL& referrerURL) {
   String referrer = referrerURL.isEmpty()
                         ? frame()->document()->outgoingReferrer()
                         : String(referrerURL.string());
   request.toMutableResourceRequest().setHTTPReferrer(
       SecurityPolicy::generateReferrer(frame()->document()->getReferrerPolicy(),
                                        request.url(), referrer));
 }
 
 void WebLocalFrameImpl::dispatchWillSendRequest(WebURLRequest& request) {
-  frame()->loader().client()->dispatchWillSendRequest(
-      request.toMutableResourceRequest());
+  frame()->loader().client()->willSendRequest(
+      request.toMutableResourceRequest(), FrameLoadTypeStandard);
 }
 
 WebAssociatedURLLoader* WebLocalFrameImpl::createAssociatedURLLoader(
     const WebAssociatedURLLoaderOptions& options) {
   return new WebAssociatedURLLoaderImpl(this, options);
 }
 
 unsigned WebLocalFrameImpl::unloadListenerCount() const {
   return frame()->domWindow()->pendingUnloadEventListeners();
 }
@@ skipping 687 matching lines @@
   webframeChild->initializeCoreFrame(frame()->host(), ownerElement, name,
                                      uniqueName);
   // Initializing the core frame may cause the new child to be detached, since
   // it may dispatch a load event in the parent.
   if (!webframeChild->parent())
     return nullptr;
 
   // If we're moving in the back/forward list, we might want to replace the
   // content of this child frame with whatever was there at that point.
   HistoryItem* childItem = nullptr;
+  FrameLoadType loadType = FrameLoadTypeStandard;
   if (isBackForwardLoadType(frame()->loader().documentLoader()->loadType()) &&
-      !frame()->document()->loadEventFinished())
+      !frame()->document()->loadEventFinished()) {
     childItem = webframeChild->client()->historyItemForNewChildFrame();
-
-  FrameLoadRequest newRequest = request;
-  FrameLoadType loadType = FrameLoadTypeStandard;
-  if (childItem) {
-    newRequest = FrameLoadRequest(
-        request.originDocument(),
-        FrameLoader::resourceRequestFromHistoryItem(
-            childItem, WebCachePolicy::UseProtocolCachePolicy));
     loadType = FrameLoadTypeInitialHistoryLoad;
   }
+
+  FrameLoadRequest newRequest =
+      childItem ? FrameLoadRequest(
+                      request.originDocument(),
+                      FrameLoader::resourceRequestFromHistoryItem(
+                          childItem, WebCachePolicy::UseProtocolCachePolicy))
+                : request;
   webframeChild->frame()->loader().load(newRequest, loadType, childItem);
 
   // Note a synchronous navigation (about:blank) would have already processed
   // onload, so it is possible for the child frame to have already been
   // detached by script in the page.
   if (!webframeChild->parent())
     return nullptr;
   return webframeChild->frame();
 }
 
@@ skipping 720 matching lines @@
       ->frameScheduler()
       ->unthrottledTaskRunner()
       ->toSingleThreadTaskRunner();
 }
 
 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const {
   return m_inputMethodController.get();
 }
 
 }  // namespace blink