OOPIF: History navigations for new child frames.

third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2011 Apple 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.
@@ skipping 565 matching lines @@
 NavigationPolicy FrameLoaderClientImpl::decidePolicyForNavigation(const ResourceRequest& request, DocumentLoader* loader, NavigationType type, NavigationPolicy policy, bool replacesCurrentHistoryItem)
 {
     if (!m_webFrame->client())
         return NavigationPolicyIgnore;
 
     if (policy == NavigationPolicyNewBackgroundTab && !allowCreatingBackgroundTabs() && !UIEventWithKeyState::newTabModifierSetFromIsolatedWorld())
         policy = NavigationPolicyNewForegroundTab;
 
     WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader(loader);
 
+    bool isHistoryNavigationInNewChildFrame = m_webFrame->parent()

[dcheng, 2015/12/01 19:47:53]

Do you mind adding a comment that describes the logic behind these various
checks? It's not completely clear to me how these various checks relate to this
being a history navigation in a new child frame.

[Charlie Reis, 2015/12/01 22:11:51]

Done.  I also noticed that I should have been using m_webFrame->parent() on the
last line to be consistent with WebLocalFrameImpl::createChildFrame.  Fixed.

+        && m_webFrame->parent()->isWebLocalFrame()
+        && isBackForwardLoadType(toWebLocalFrameImpl(m_webFrame->parent())->frame()->loader().loadType())
+        && !m_webFrame->frame()->document()->loadEventFinished();
+
     WrappedResourceRequest wrappedResourceRequest(request);
     WebFrameClient::NavigationPolicyInfo navigationInfo(wrappedResourceRequest);
     navigationInfo.navigationType = static_cast<WebNavigationType>(type);
     navigationInfo.defaultPolicy = static_cast<WebNavigationPolicy>(policy);
     navigationInfo.extraData = ds ? ds->extraData() : nullptr;
     navigationInfo.replacesCurrentHistoryItem = replacesCurrentHistoryItem;
+    navigationInfo.isHistoryNavigationInNewChildFrame = isHistoryNavigationInNewChildFrame;
 
     WebNavigationPolicy webPolicy = m_webFrame->client()->decidePolicyForNavigation(navigationInfo);
     return static_cast<NavigationPolicy>(webPolicy);
 }
 
 bool FrameLoaderClientImpl::hasPendingNavigation()
 {
     if (!m_webFrame->client())
         return false;
 
@@ skipping 410 matching lines @@
 
 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, SuddenTerminationDisablerType type)
 {
     if (m_webFrame->client()) {
         m_webFrame->client()->suddenTerminationDisablerChanged(
             present, static_cast<WebFrameClient::SuddenTerminationDisablerType>(type));
     }
 }
 
 } // namespace blink