Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index ebc42b1dc4aa30341b2ec87d98ee813fb198728e..180e4cbdf2cd0741c8dbd95b094a9cc1b0ccf76c 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -1059,6 +1059,15 @@ void RenderFrameImpl::OnNavigate(const FrameMsg_Navigate_Params& params) { |
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. |
@@ -2341,6 +2350,11 @@ void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame, |
// 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'r
|
} |
FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), |
@@ -2978,7 +2992,7 @@ void RenderFrameImpl::willSendRequest( |
// 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
|
WebDataSource* top_data_source = top_frame->dataSource(); |
WebDataSource* data_source = |
provisional_data_source ? provisional_data_source : top_data_source; |