diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 19:29:47 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 19:30:59 +0000 |
| commit | 4e49497a7ec0da1dbc00c569b7457a221c9214d3 (patch) | |
| tree | f529169dfa9b317e5b7a9ab91683fe05d2b4ab42 /content/browser/loader/resource_dispatcher_host_impl.cc | |
| parent | c3f5a257d99feea7645d93cd7586200b980290f8 (diff) | |
| download | chromium_src-4e49497a7ec0da1dbc00c569b7457a221c9214d3.zip chromium_src-4e49497a7ec0da1dbc00c569b7457a221c9214d3.tar.gz chromium_src-4e49497a7ec0da1dbc00c569b7457a221c9214d3.tar.bz2 | |
Revert of [site isolation] cross-site transfers should track the RenderFrameHost, not the View (https://codereview.chromium.org/457003002/)
Reason for revert:
Speculatively reverting CL in case it is causing WebNavigationApiTest.OpenTab to fail http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20Chromium&testType=browser_tests&tests=WebNavigationApiTest.OpenTab
Original issue's description:
> 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
TBR=creis@chromium.org,nick@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=304341, 400850
Review URL: https://codereview.chromium.org/462083003
Cr-Commit-Position: refs/heads/master@{#289049}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289049 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/resource_dispatcher_host_impl.cc')
| -rw-r--r-- | content/browser/loader/resource_dispatcher_host_impl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index e30a0f6..17cfcf7 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc @@ -27,6 +27,7 @@ #include "content/browser/appcache/chrome_appcache_service.h" #include "content/browser/cert_store_impl.h" #include "content/browser/child_process_security_policy_impl.h" +#include "content/browser/cross_site_request_manager.h" #include "content/browser/download/download_resource_handler.h" #include "content/browser/download/save_file_manager.h" #include "content/browser/download/save_file_resource_handler.h" |