diff options
| author | creis <creis@chromium.org> | 2015-02-27 16:28:17 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-28 00:28:56 +0000 |
| commit | 159d8ae5ad6c2b45a3c891cef89fe15cdaf46b5e (patch) | |
| tree | 8bd3c5f21abc91533c6afa0097ad45b584b5e6fa | |
| parent | 879405ae813ae4a9bcbd7684d3551420d4980383 (diff) | |
| download | chromium_src-159d8ae5ad6c2b45a3c891cef89fe15cdaf46b5e.zip chromium_src-159d8ae5ad6c2b45a3c891cef89fe15cdaf46b5e.tar.gz chromium_src-159d8ae5ad6c2b45a3c891cef89fe15cdaf46b5e.tar.bz2 | |
Make sure the --site-per-process flag is present for subframe process swaps.
BUG=461494
TEST=Crash report should show that --site-per-process flag is present.
Review URL: https://codereview.chromium.org/959303003
Cr-Commit-Position: refs/heads/master@{#318558}
| -rw-r--r-- | content/browser/loader/cross_site_resource_handler.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc index 44d24ce..ccdd321 100644 --- a/content/browser/loader/cross_site_resource_handler.cc +++ b/content/browser/loader/cross_site_resource_handler.cc @@ -68,6 +68,13 @@ void OnCrossSiteResponseHelper(const CrossSiteResponseParams& params) { RenderFrameHostImpl::FromID(params.global_request_id.child_id, params.render_frame_id); if (rfh) { + if (rfh->GetParent()) { + // We should only swap processes for subframes in --site-per-process mode. + // CrossSiteResourceHandler is not installed on subframe requests in + // default Chrome. + CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kSitePerProcess)); + } rfh->OnCrossSiteResponse( params.global_request_id, cross_site_transferring_request.Pass(), params.transfer_url_chain, params.referrer, |