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

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

Issue 2636193003: Fix cross-site subframe navigations that transfer back to original RFH. (Closed)
Patch Set: Try #3 Created 3 years, 11 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
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 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
741 bool is_reload); 741 bool is_reload);
742 742
743 // Updates the pending WebUI of the current RenderFrameHost for a same-site 743 // Updates the pending WebUI of the current RenderFrameHost for a same-site
744 // navigation. 744 // navigation.
745 void UpdatePendingWebUIOnCurrentFrameHost(const GURL& dest_url, 745 void UpdatePendingWebUIOnCurrentFrameHost(const GURL& dest_url,
746 int entry_bindings); 746 int entry_bindings);
747 747
748 // Returns true if a subframe can navigate cross-process. 748 // Returns true if a subframe can navigate cross-process.
749 bool CanSubframeSwapProcess(const GURL& dest_url, 749 bool CanSubframeSwapProcess(const GURL& dest_url,
750 SiteInstance* source_instance, 750 SiteInstance* source_instance,
751 SiteInstance* dest_instance); 751 SiteInstance* dest_instance,
752 bool for_transfer);
752 753
753 // For use in creating RenderFrameHosts. 754 // For use in creating RenderFrameHosts.
754 FrameTreeNode* frame_tree_node_; 755 FrameTreeNode* frame_tree_node_;
755 756
756 // Our delegate, not owned by us. Guaranteed non-NULL. 757 // Our delegate, not owned by us. Guaranteed non-NULL.
757 Delegate* delegate_; 758 Delegate* delegate_;
758 759
759 // Implemented by the owner of this class. These delegates are installed into 760 // Implemented by the owner of this class. These delegates are installed into
760 // all the RenderFrameHosts that we create. 761 // all the RenderFrameHosts that we create.
761 RenderFrameHostDelegate* render_frame_delegate_; 762 RenderFrameHostDelegate* render_frame_delegate_;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 std::unique_ptr<RenderFrameHostImpl> speculative_render_frame_host_; 805 std::unique_ptr<RenderFrameHostImpl> speculative_render_frame_host_;
805 806
806 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; 807 base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
807 808
808 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); 809 DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
809 }; 810 };
810 811
811 } // namespace content 812 } // namespace content
812 813
813 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_ 814 #endif // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698