|
site isolation: cross-site transfers should track the RenderFrameHost, not the View
This fixes some issues that came up while debugging bug 400850, which inadvertently caused OOPIF-like view reuse in RenderFrameHostManagerTest.AllowTargetedNavigationsAfterSwap.
1. Make navigation_suspended state be per-RenderFrameHost. What was happening, was that we'd suspend navigations on the non-main frame of the view, and upon resume, we'd switch frames.
2. Make the map of pending cross site requests be a map of RenderFrameHost IDs instead of RenderViewHost IDs, instead of just assuming that it's the main frame of the view that's navigating.
3. Add a pending_main_rfh() to the test apparatus, for use by unittests that query the navigation_suspended state.
BUG= 304341, 400850
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=288867
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+177 lines, -172 lines) |
Patch |
 |
M |
content/browser/cross_site_request_manager.h
|
View
|
|
3 chunks |
+13 lines, -13 lines |
0 comments
|
Download
|
 |
M |
content/browser/cross_site_request_manager.cc
|
View
|
|
1 chunk |
+8 lines, -8 lines |
0 comments
|
Download
|
 |
M |
content/browser/frame_host/render_frame_host_impl.h
|
View
|
1
2
3
|
3 chunks |
+48 lines, -0 lines |
0 comments
|
Download
|
 |
M |
content/browser/frame_host/render_frame_host_impl.cc
|
View
|
1
|
6 chunks |
+47 lines, -4 lines |
0 comments
|
Download
|
 |
M |
content/browser/frame_host/render_frame_host_manager.cc
|
View
|
|
7 chunks |
+13 lines, -20 lines |
0 comments
|
Download
|
 |
M |
content/browser/frame_host/render_frame_host_manager_unittest.cc
|
View
|
1
|
3 chunks |
+5 lines, -6 lines |
0 comments
|
Download
|
 |
M |
content/browser/loader/cross_site_resource_handler.cc
|
View
|
|
2 chunks |
+5 lines, -4 lines |
0 comments
|
Download
|
 |
M |
content/browser/loader/resource_dispatcher_host_impl.cc
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
 |
M |
content/browser/renderer_host/render_view_host_impl.h
|
View
|
|
3 chunks |
+0 lines, -48 lines |
0 comments
|
Download
|
 |
M |
content/browser/renderer_host/render_view_host_impl.cc
|
View
|
|
5 chunks |
+0 lines, -45 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_impl_unittest.cc
|
View
|
1
2
3
|
4 chunks |
+19 lines, -20 lines |
0 comments
|
Download
|
 |
M |
content/public/test/test_renderer_host.h
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
content/public/test/test_renderer_host.cc
|
View
|
1
2
|
1 chunk |
+13 lines, -3 lines |
0 comments
|
Download
|
 |
M |
content/test/test_render_view_host.h
|
View
|
1
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
 |
M |
content/test/test_render_view_host.cc
|
View
|
1
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
Total messages: 6 (0 generated)
|