PlzNavigate: Clear provisional history item on redirects.

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 191 matching lines @@
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 
     if (resource)
         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.
+    DCHECK(frameLoader());
+    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()
 {
     if (frame() && frame()->isMainFrame() && m_state >= Committed) {
         frameLoader()->client()->didChangePerformanceTiming();
     }
@@ skipping 100 matching lines @@
         FrameLoader::reportLocalLoadFailed(m_frame, requestURL.getString());
         m_fetcher->stopFetching();
         return;
     }
     if (!frameLoader()->shouldContinueForNavigationPolicy(m_request, SubstituteData(), this, CheckContentSecurityPolicy, m_navigationType, NavigationPolicyCurrentTab, replacesCurrentHistoryItem(), isClientRedirect())) {
         m_fetcher->stopFetching();
         return;
     }
 
     ASSERT(timing().fetchStart());
-    timing().addRedirect(redirectResponse.url(), requestURL);
     appendRedirect(requestURL);
-    frameLoader()->receivedMainResourceRedirect(requestURL);
+    didRedirect(redirectResponse.url(), requestURL);
+    frameLoader()->client()->dispatchDidReceiveServerRedirectForProvisionalLoad();
 }
 
 static bool canShowMIMEType(const String& mimeType, LocalFrame* frame)
 {
     if (Platform::current()->mimeRegistry()->supportsMIMEType(mimeType) == WebMimeRegistry::IsSupported)
         return true;
     PluginData* pluginData = frame->pluginData();
     return !mimeType.isEmpty() && pluginData && pluginData->supportsMimeType(mimeType);
 }
 
@@ skipping 373 matching lines @@
 {
     m_writer = createWriterFor(init, mimeType(), m_writer ? m_writer->encoding() : emptyAtom, true, ForceSynchronousParsing);
     if (!source.isNull())
         m_writer->appendReplacingData(source);
     endWriting(m_writer.get());
 }
 
 DEFINE_WEAK_IDENTIFIER_MAP(DocumentLoader);
 
 } // namespace blink