Ensure we properly set PageTransition for iframes.

content/renderer/render_frame_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 1041 matching lines @@
   GetContentClient()->SetActiveURL(params.common_params.url);
 
   WebFrame* frame = frame_;
   if (!params.frame_to_navigate.empty()) {
     // TODO(nasko): Move this lookup to the browser process.
     frame = render_view_->webview()->findFrameByName(
         WebString::fromUTF8(params.frame_to_navigate));
     CHECK(frame) << "Invalid frame name passed: " << params.frame_to_navigate;
   }
 
+  if (ui::PageTransitionCoreTypeIs(params.common_params.transition,
+                                   ui::PAGE_TRANSITION_MANUAL_SUBFRAME)) {

[Nate Chapin, 2015/03/12 20:31:56]

Propagate the state back into blink.

+    CHECK(frame_->parent());
+    if (frame_->parent()->isWebRemoteFrame()) {
+        CHECK_EQ(frame, frame_);
+        frame_->setCommittedFirstRealLoad();
+    }
+  }
+
   if (is_reload && !render_view_->history_controller()->GetCurrentEntry()) {
     // We cannot reload if we do not have any history state.  This happens, for
     // example, when recovering from a crash.
     is_reload = false;
     cache_policy = WebURLRequest::ReloadIgnoringCacheData;
   }
 
   render_view_->pending_navigation_params_.reset(
       new FrameMsg_Navigate_Params(params));
 
@@ skipping 1262 matching lines @@
   if (is_top_most) {
     render_view_->set_navigation_gesture(
         WebUserGestureIndicator::isProcessingUserGesture() ?
             NavigationGestureUser : NavigationGestureAuto);
   } else if (ds->replacesCurrentHistoryItem()) {
     // Subframe navigations that don't add session history items must be
     // marked with AUTO_SUBFRAME. See also didFailProvisionalLoad for how we
     // handle loading of error pages.
     document_state->navigation_state()->set_transition_type(
         ui::PAGE_TRANSITION_AUTO_SUBFRAME);
+  } else if (ui::PageTransitionCoreTypeIs(
+                 document_state->navigation_state()->transition_type(),
+                 ui::PAGE_TRANSITION_LINK)) {
+    document_state->navigation_state()->set_transition_type(
+        ui::PAGE_TRANSITION_MANUAL_SUBFRAME);

[Nate Chapin, 2015/03/12 20:31:56]

Set the transition type correctly in the case we're breaking.

   }
 
   FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
                     DidStartProvisionalLoad(frame));
   FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidStartProvisionalLoad());
 
   Send(new FrameHostMsg_DidStartProvisionalLoadForFrame(
        routing_id_, ds->request().url(), is_transition_navigation));
 }
 
@@ skipping 617 matching lines @@
       }
     }
   }
 
   WebFrame* top_frame = frame->top();
   // TODO(nasko): Hack around asking about top-frame data source. This means
   // for out-of-process iframes we are treating the current frame as the
   // top-level frame, which is wrong.
   if (!top_frame || top_frame->isWebRemoteFrame())
     top_frame = frame;
-  WebDataSource* provisional_data_source = top_frame->provisionalDataSource();
+  WebDataSource* provisional_data_source = frame->provisionalDataSource();

[Nate Chapin, 2015/03/12 20:31:56]

I have no idea why we use the top frame here, but it seems wrong to me.

   WebDataSource* top_data_source = top_frame->dataSource();
   WebDataSource* data_source =
       provisional_data_source ? provisional_data_source : top_data_source;
 
   DocumentState* document_state = DocumentState::FromDataSource(data_source);
   DCHECK(document_state);
   InternalDocumentStateData* internal_data =
       InternalDocumentStateData::FromDocumentState(document_state);
   NavigationState* navigation_state = document_state->navigation_state();
   ui::PageTransition transition_type = navigation_state->transition_type();
@@ skipping 1518 matching lines @@
 
 #if defined(ENABLE_BROWSER_CDMS)
 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
   if (!cdm_manager_)
     cdm_manager_ = new RendererCdmManager(this);
   return cdm_manager_;
 }
 #endif  // defined(ENABLE_BROWSER_CDMS)
 
 }  // namespace content