Fix setHistoryItemStateForCommit for back/forward in subframes.

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008 Alp Toker <alp@atoker.com>
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com>
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 345 matching lines @@
 }
 
 void FrameLoader::receivedMainResourceRedirect(const KURL& newURL)
 {
     client()->dispatchDidReceiveServerRedirectForProvisionalLoad();
     // If a back/forward navigation redirects cross-origin, don't reuse any state from the HistoryItem.
     if (m_provisionalItem && !SecurityOrigin::create(m_provisionalItem->url())->isSameSchemeHostPort(SecurityOrigin::create(newURL).get()))
         m_provisionalItem.clear();
 }
 
-void FrameLoader::setHistoryItemStateForCommit(HistoryCommitType historyCommitType, HistoryNavigationType navigationType)
+void FrameLoader::setHistoryItemStateForCommit(FrameLoadType loadType, HistoryCommitType historyCommitType, HistoryNavigationType navigationType)
 {
     HistoryItem* oldItem = m_currentItem;
-    if (historyCommitType == BackForwardCommit && m_provisionalItem)
+    if (isBackForwardLoadType(loadType) && m_provisionalItem)

[Charlie Reis, 2016/07/14 20:45:47]

It's non-trivial to write a isBackForwardCommitType, because HistoryCommitType
conflates FrameLoadTypeInitialHistoryLoad and FrameLoadTypeInitialInChildFrame
(the latter of which is not a history load).

I suppose I could split apart HistoryCommitType's InitialCommitInChildFrame and
try to update all the uses, if that would be better.  Using the FrameLoadType
here gives us what we need, anyway.

[alexmos, 2016/07/14 23:03:27]

Acknowledged, either approach seems fine to me.  There are only a couple of
places that use InitialCommitInChildFrame if you wanted to split it apart, but
your current approach seems ok as well.  If you split them, you might still want
something like isInitialCommitInChildFrame(HistoryCommitType), which would be
handy in places like the mixed content check in FrameLoader::receivedFirstData.

         m_currentItem = m_provisionalItem.release();
     else
         m_currentItem = HistoryItem::create();
     m_currentItem->setURL(m_documentLoader->urlForHistory());
     m_currentItem->setDocumentState(m_frame->document()->formElementsState());
     m_currentItem->setTarget(m_frame->tree().uniqueName());
     m_currentItem->setReferrer(SecurityPolicy::generateReferrer(m_documentLoader->request().getReferrerPolicy(), m_currentItem->url(), m_documentLoader->request().httpReferrer()));
     m_currentItem->setFormInfoFromRequest(m_documentLoader->request());
 
     // Don't propagate state from the old item to the new item if there isn't an old item (obviously),
     // or if this is a back/forward navigation, since we explicitly want to restore the state we just
     // committed.
-    if (!oldItem || historyCommitType == BackForwardCommit)
+    if (!oldItem || isBackForwardLoadType(loadType))
         return;
     // Don't propagate state from the old item if this is a different-document navigation, unless the before
     // and after pages are logically related. This means they have the same url (ignoring fragment) and
     // the new item was loaded via reload or client redirect.
     if (navigationType == HistoryNavigationType::DifferentDocument && (historyCommitType != HistoryInertCommit || !equalIgnoringFragmentIdentifier(oldItem->url(), m_currentItem->url())))
         return;
     m_currentItem->setDocumentSequenceNumber(oldItem->documentSequenceNumber());
     m_currentItem->setScrollPoint(oldItem->scrollPoint());
     m_currentItem->setVisualViewportScrollPoint(oldItem->visualViewportScrollPoint());
     m_currentItem->setPageScaleFactor(oldItem->pageScaleFactor());
@@ skipping 28 matching lines @@
 void FrameLoader::receivedFirstData()
 {
     if (m_stateMachine.creatingInitialEmptyDocument())
         return;
 
     HistoryCommitType historyCommitType = loadTypeToCommitType(m_loadType);
     if (historyCommitType == StandardCommit && (m_documentLoader->urlForHistory().isEmpty() || (opener() && !m_currentItem && m_documentLoader->originalRequest().url().isEmpty())))
         historyCommitType = HistoryInertCommit;
     else if (historyCommitType == InitialCommitInChildFrame && MixedContentChecker::isMixedContent(m_frame->tree().top()->securityContext()->getSecurityOrigin(), m_documentLoader->url()))
         historyCommitType = HistoryInertCommit;
-    setHistoryItemStateForCommit(historyCommitType, HistoryNavigationType::DifferentDocument);
+    setHistoryItemStateForCommit(m_loadType, historyCommitType, HistoryNavigationType::DifferentDocument);
 
     if (!m_stateMachine.committedMultipleRealLoads() && m_loadType == FrameLoadTypeStandard)
         m_stateMachine.advanceTo(FrameLoaderStateMachine::CommittedMultipleRealLoads);
 
     client()->dispatchDidCommitLoad(m_currentItem.get(), historyCommitType);
 
     // When the embedder gets notified (above) that the new navigation has
     // committed, the embedder will drop the old Content Security Policy and
     // therefore now is a good time to report to the embedder the Content
     // Security Policies that have accumulated so far for the new navigation.
@@ skipping 265 matching lines @@
     // Generate start and stop notifications only when loader is completed so that we
     // don't fire them for fragment redirection that happens in window.onload handler.
     // See https://bugs.webkit.org/show_bug.cgi?id=31838
     if (m_frame->document()->loadEventFinished())
         client()->didStartLoading(NavigationWithinSameDocument);
 
     HistoryCommitType historyCommitType = loadTypeToCommitType(type);
     if (!m_currentItem)
         historyCommitType = HistoryInertCommit;
 
-    setHistoryItemStateForCommit(historyCommitType, sameDocumentNavigationSource == SameDocumentNavigationHistoryApi ? HistoryNavigationType::HistoryApi : HistoryNavigationType::Fragment);
+    setHistoryItemStateForCommit(type, historyCommitType, sameDocumentNavigationSource == SameDocumentNavigationHistoryApi ? HistoryNavigationType::HistoryApi : HistoryNavigationType::Fragment);
     if (sameDocumentNavigationSource == SameDocumentNavigationHistoryApi) {
         m_currentItem->setStateObject(data);
         m_currentItem->setScrollRestorationType(scrollRestorationType);
     }
     client()->dispatchDidNavigateWithinPage(m_currentItem.get(), historyCommitType, !!initiatingDocument);
     client()->dispatchDidReceiveTitle(m_frame->document()->title());
     if (m_frame->document()->loadEventFinished())
         client()->didStopLoading();
 }
 
@@ skipping 885 matching lines @@
     tracedValue->setString("documentLoaderURL", m_documentLoader ? m_documentLoader->url() : String());
     return tracedValue;
 }
 
 inline void FrameLoader::takeObjectSnapshot() const
 {
     TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, toTracedValue());
 }
 
 } // namespace blink