PlzNavigate: transmit redirect info to the renderer side

third_party/WebKit/Source/core/loader/DocumentLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2011 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 209 matching lines @@
   }
 
   // CSP layout tests verify that preloads are subject to access checks by
   // seeing if they are in the `preload started` list. Therefore do not add
   // them to the list if the load is immediately denied.
   if (resource && !resource->resourceError().isAccessCheck())
     fetcher()->preloadStarted(resource);
   return resource;
 }
 
-void DocumentLoader::didRedirect(const KURL& oldURL, const KURL& newURL) {
-  timing().addRedirect(oldURL, newURL);
-
-  // If a redirection happens during a back/forward navigation, don't restore
-  // any state from the old HistoryItem. There is a provisional history item for
-  // back/forward navigation only. In the other case, clearing it is a no-op.
-  frameLoader().clearProvisionalHistoryItem();
-}
-
 void DocumentLoader::dispatchLinkHeaderPreloads(
     ViewportDescriptionWrapper* viewport,
     LinkLoader::MediaPreloadPolicy mediaPolicy) {
   LinkLoader::loadLinksFromHeader(
       response().httpHeaderField(HTTPNames::Link), response().url(),
       m_frame->document(), NetworkHintsInterfaceImpl(),
       LinkLoader::OnlyLoadResources, mediaPolicy, viewport);
 }
 
 void DocumentLoader::didChangePerformanceTiming() {
@@ skipping 126 matching lines @@
   if (!frameLoader().shouldContinueForNavigationPolicy(
           m_request, SubstituteData(), this, CheckContentSecurityPolicy,
           m_navigationType, NavigationPolicyCurrentTab, m_loadType,
           isClientRedirect(), nullptr)) {
     m_fetcher->stopFetching();
     return false;
   }
 
   DCHECK(timing().fetchStart());
   appendRedirect(requestURL);
-  didRedirect(redirectResponse.url(), requestURL);
+  timing().addRedirect(redirectResponse.url(), requestURL);
+
+  // If a redirection happens during a back/forward navigation, don't restore
+  // any state from the old HistoryItem. There is a provisional history item for
+  // back/forward navigation only. In the other case, clearing it is a no-op.
+  frameLoader().clearProvisionalHistoryItem();
+
   frameLoaderClient().dispatchDidReceiveServerRedirectForProvisionalLoad();
 
   return true;
 }
 
 static bool canShowMIMEType(const String& mimeType, LocalFrame* frame) {
   if (MIMETypeRegistry::isSupportedMIMEType(mimeType))
     return true;
   PluginData* pluginData = frame->pluginData();
   return !mimeType.isEmpty() && pluginData &&
@@ skipping 417 matching lines @@
                              m_writer ? m_writer->encoding() : emptyAtom, true,
                              ForceSynchronousParsing);
   if (!source.isNull())
     m_writer->appendReplacingData(source);
   endWriting();
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 }  // namespace blink