|
@@ -71,10 +71,10 @@ index f0b9f9634264e9073f22560903307332986df2fe..934fa63595053156b446dbc5fdccb196
|
|
|
render_frame_host_ =
|
|
|
frame_tree_node_->render_manager()->GetFrameHostForNavigation(this);
|
|
|
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
|
|
|
-index f76a633c85c8e53d99c1280d359b6ddcf6bcfbbc..676f70c59f75d47c94902eba3776949b749f267f 100644
|
|
|
+index 4c370c23a2217b45d7f023708305b3d1b115790a..9a3a207eab69464f35ffd39b75417311a9102cc2 100644
|
|
|
--- a/content/browser/frame_host/render_frame_host_manager.cc
|
|
|
+++ b/content/browser/frame_host/render_frame_host_manager.cc
|
|
|
-@@ -2392,6 +2392,16 @@ bool RenderFrameHostManager::InitRenderView(
|
|
|
+@@ -2391,6 +2391,16 @@ bool RenderFrameHostManager::InitRenderView(
|
|
|
scoped_refptr<SiteInstance>
|
|
|
RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
|
|
NavigationRequest* request) {
|
|
@@ -91,7 +91,7 @@ index f76a633c85c8e53d99c1280d359b6ddcf6bcfbbc..676f70c59f75d47c94902eba3776949b
|
|
|
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
|
|
|
|
|
|
// All children of MHTML documents must be MHTML documents. They all live in
|
|
|
-@@ -2411,10 +2421,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
|
|
+@@ -2410,10 +2420,60 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
|
|
//
|
|
|
// TODO(clamy): We should also consider as a candidate SiteInstance the
|
|
|
// speculative SiteInstance that was computed on redirects.
|
|
@@ -156,7 +156,7 @@ index f76a633c85c8e53d99c1280d359b6ddcf6bcfbbc..676f70c59f75d47c94902eba3776949b
|
|
|
|
|
|
// Account for renderer-initiated reload as well.
|
|
|
// Needed as a workaround for https://crbug.com/1045524, remove it when it is
|
|
|
-@@ -2456,6 +2516,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
|
|
+@@ -2455,6 +2515,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
|
|
|
request->dest_site_instance() != dest_site_instance) {
|
|
|
request->ResetStateForSiteInstanceChange();
|
|
|
}
|