Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(636)

Side by Side Diff: content/browser/frame_host/render_frame_host_manager.h

Issue 2236753002: OOPIF: Reinitialize a dead subframe correctly for same-site navigations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@crash-RenderView-pending-rfh
Patch Set: Fix Charlie's nit Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <list> 10 #include <list>
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 // Create and initialize a speculative RenderFrameHost for an ongoing 678 // Create and initialize a speculative RenderFrameHost for an ongoing
679 // navigation. It might be destroyed and re-created later if the navigation 679 // navigation. It might be destroyed and re-created later if the navigation
680 // is redirected to a different SiteInstance. 680 // is redirected to a different SiteInstance.
681 bool CreateSpeculativeRenderFrameHost(SiteInstance* old_instance, 681 bool CreateSpeculativeRenderFrameHost(SiteInstance* old_instance,
682 SiteInstance* new_instance); 682 SiteInstance* new_instance);
683 683
684 // Initialization for RenderFrameHost uses the same sequence as InitRenderView 684 // Initialization for RenderFrameHost uses the same sequence as InitRenderView
685 // above. 685 // above.
686 bool InitRenderFrame(RenderFrameHostImpl* render_frame_host); 686 bool InitRenderFrame(RenderFrameHostImpl* render_frame_host);
687 687
688 // Helper to reinitialize the RenderFrame, RenderView, and the opener chain
689 // for the provided |render_frame_host|. Used when the |render_frame_host|
690 // needs to be reused for a new navigation, but it is not live.
691 bool ReinitializeRenderFrame(RenderFrameHostImpl* render_frame_host);
692
688 // Makes the pending WebUI on the current RenderFrameHost active. Call this 693 // Makes the pending WebUI on the current RenderFrameHost active. Call this
689 // when the current RenderFrameHost commits and it has a pending WebUI. 694 // when the current RenderFrameHost commits and it has a pending WebUI.
690 void CommitPendingWebUI(); 695 void CommitPendingWebUI();
691 696
692 // Sets the pending RenderFrameHost to be the active one. Call when the 697 // Sets the pending RenderFrameHost to be the active one. Call when the
693 // pending RenderFrameHost commits. 698 // pending RenderFrameHost commits.
694 // If PlzNavigate is enabled the method will set the speculative (not pending) 699 // If PlzNavigate is enabled the method will set the speculative (not pending)
695 // RenderFrameHost to be the active one. 700 // RenderFrameHost to be the active one.
696 void CommitPending(); 701 void CommitPending();
697 702
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 std::unique_ptr<RenderFrameHostImpl> speculative_render_frame_host_; 811 std::unique_ptr<RenderFrameHostImpl> speculative_render_frame_host_;
807 812
808 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 813 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
809 814
810 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 815 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
811 }; 816 };
812 817
813 } // namespace content 818 } // namespace content
814 819
815 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 820 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698