Move HistoryItem handling to DocumentLoader

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 1659 matching lines @@
   // 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;
   if (isBackForwardLoadType(frame()->loader().documentLoader()->loadType()) &&
       !frame()->document()->loadEventFinished())
     childItem = webframeChild->client()->historyItemForNewChildFrame();
 
   FrameLoadRequest newRequest = request;
   FrameLoadType loadType = FrameLoadTypeStandard;
   if (childItem) {
-    newRequest = FrameLoadRequest(
-        request.originDocument(),
-        FrameLoader::resourceRequestFromHistoryItem(
-            childItem, WebCachePolicy::UseProtocolCachePolicy));
+    newRequest = FrameLoadRequest(request.originDocument(),
+                                  childItem->generateResourceRequest(
+                                      WebCachePolicy::UseProtocolCachePolicy));
     loadType = FrameLoadTypeInitialHistoryLoad;
   }
   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 293 matching lines @@
   if (!frame())
     return true;
 
   return frame()->loader().shouldClose(isReload);
 }
 
 WebURLRequest WebLocalFrameImpl::requestFromHistoryItem(
     const WebHistoryItem& item,
     WebCachePolicy cachePolicy) const {
   HistoryItem* historyItem = item;
-  ResourceRequest request =
-      FrameLoader::resourceRequestFromHistoryItem(historyItem, cachePolicy);
-  return WrappedResourceRequest(request);
+  return WrappedResourceRequest(
+      historyItem->generateResourceRequest(cachePolicy));
 }
 
 WebURLRequest WebLocalFrameImpl::requestForReload(
     WebFrameLoadType loadType,
     const WebURL& overrideUrl) const {
   DCHECK(frame());
   ResourceRequest request = frame()->loader().resourceRequestForReload(
       static_cast<FrameLoadType>(loadType), overrideUrl);
   return WrappedResourceRequest(request);
 }
@@ skipping 34 matching lines @@
                                  bool isClientRedirect) {
   DCHECK(frame());
 
   // If we are loading substitute data to replace an existing load, then
   // inherit all of the properties of that original request. This way,
   // reload will re-attempt the original request. It is essential that
   // we only do this when there is an unreachableURL since a non-empty
   // unreachableURL informs FrameLoader::reload to load unreachableURL
   // instead of the currently loaded URL.
   ResourceRequest request;
-  if (replace && !unreachableURL.isEmpty() &&
-      frame()->loader().provisionalDocumentLoader())
-    request = frame()->loader().provisionalDocumentLoader()->originalRequest();
+  HistoryItem* historyItem = item;
+  DocumentLoader* provisionalDocumentLoader =
+      frame()->loader().provisionalDocumentLoader();
+  if (replace && !unreachableURL.isEmpty() && provisionalDocumentLoader) {
+    request = provisionalDocumentLoader->originalRequest();
+    // When replacing a failed back/forward provisional navigation with an error
+    // page, retain the HistoryItem for the failed provisional navigation
+    // and reuse it for the error page navigation.
+    if (provisionalDocumentLoader->loadType() == FrameLoadTypeBackForward) {
+      historyItem = provisionalDocumentLoader->historyItem();
+      webFrameLoadType = WebFrameLoadType::BackForward;
+    }
+  }
   request.setURL(baseURL);
   request.setCheckForBrowserSideNavigation(false);
 
   FrameLoadRequest frameRequest(
       0, request, SubstituteData(data, mimeType, textEncoding, unreachableURL));
   DCHECK(frameRequest.substituteData().isValid());
   frameRequest.setReplacesCurrentItem(replace);
   if (isClientRedirect)
     frameRequest.setClientRedirect(ClientRedirectPolicy::ClientRedirect);
 
-  HistoryItem* historyItem = item;
   frame()->loader().load(
       frameRequest, static_cast<FrameLoadType>(webFrameLoadType), historyItem,
       static_cast<HistoryLoadType>(webHistoryLoadType));
 }
 
 bool WebLocalFrameImpl::maybeRenderFallbackContent(
     const WebURLError& error) const {
   DCHECK(frame());
 
   if (!frame()->owner() || !frame()->owner()->canRenderFallbackContent())
     return false;
 
-  FrameLoader& frameloader = frame()->loader();
-  DCHECK(frameloader.provisionalDocumentLoader());
-  frameloader.loadFailed(frameloader.provisionalDocumentLoader(), error);
+  DCHECK(frame()->loader().provisionalDocumentLoader());
+  frame()->loader().provisionalDocumentLoader()->loadFailed(error);
   return true;
 }
 
 // Called when a navigation is blocked because a Content Security Policy (CSP)
 // is infringed.
 void WebLocalFrameImpl::reportContentSecurityPolicyViolation(
     const blink::WebContentSecurityPolicyViolation& violation) {
   addMessageToConsole(blink::WebConsoleMessage(
       WebConsoleMessage::LevelError, violation.consoleMessage,
       violation.sourceLocation.url, violation.sourceLocation.lineNumber,
@@ skipping 417 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink