Move loadType() to DocumentLoader

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 511 matching lines @@
   // Newly created child frames may need to be navigated to a history item
   // during a back/forward navigation. This will only happen when the parent
   // is a LocalFrame doing a back/forward navigation that has not completed.
   // (If the load has completed and the parent later adds a frame with script,
   // we do not want to use a history item for it.)
   bool isHistoryNavigationInNewChildFrame =
       m_webFrame->parent() && m_webFrame->parent()->isWebLocalFrame() &&
       isBackForwardLoadType(toWebLocalFrameImpl(m_webFrame->parent())
                                 ->frame()
                                 ->loader()
-                                .loadType()) &&
+                                .documentLoader()

[yhirano, 2017/01/25 06:30:43]

This function can be called from DocumentLoader::redirectReceived, which means
previous FrameLoader::loadType() equals to
provisionalDocumentLoader()->loadType(), right?

This function can be called from FrameLoader::startLoad. In such a case
consulting documentLoader() looks fine (if it exists - see my question in
FrameLoader::checkCompleted). 

[Nate Chapin, 2017/01/25 17:25:29]

This logic is not looking at this frame's load type, but the parent's load type.

For this frame, the provisionalDocumentLoader()->loadType() would be correct.
But when checking the parent, the committed documentLoader() is always right. If
an iframe's navigation needs to check its parent's state, it always wants the
DocumentLoader of it's parent's current Document, which is the committed
DocumentLoader.

Did that make sense?

+                                ->loadType()) &&
       !toWebLocalFrameImpl(m_webFrame->parent())
            ->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->getExtraData() : nullptr;
@@ skipping 449 matching lines @@
 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() {
   return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())
       ->devToolsAgentImpl();
 }
 
 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
   return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
 }
 
 }  // namespace blink