Index: content/browser/frame_host/navigation_request.cc |
diff --git a/content/browser/frame_host/navigation_request.cc b/content/browser/frame_host/navigation_request.cc |
index c13a7e7f346df429cfd58896da678a198019f258..b594aa356d819b94e0c24a2fedf2d7694e2226cb 100644 |
--- a/content/browser/frame_host/navigation_request.cc |
+++ b/content/browser/frame_host/navigation_request.cc |
@@ -6,6 +6,7 @@ |
#include <utility> |
+#include "content/browser/child_process_security_policy_impl.h" |
#include "content/browser/devtools/render_frame_devtools_agent_host.h" |
#include "content/browser/frame_host/frame_tree.h" |
#include "content/browser/frame_host/frame_tree_node.h" |
@@ -15,6 +16,7 @@ |
#include "content/browser/frame_host/navigator.h" |
#include "content/browser/frame_host/navigator_impl.h" |
#include "content/browser/loader/navigation_url_loader.h" |
+#include "content/browser/renderer_host/render_process_host_impl.h" |
#include "content/browser/service_worker/service_worker_context_wrapper.h" |
#include "content/browser/service_worker/service_worker_navigation_handle.h" |
#include "content/browser/site_instance_impl.h" |
@@ -514,7 +516,10 @@ void NavigationRequest::OnRedirectChecksComplete( |
// Abort the request if needed. This will destroy the NavigationRequest. |
if (result == NavigationThrottle::CANCEL_AND_IGNORE || |
- result == NavigationThrottle::CANCEL) { |
+ result == NavigationThrottle::CANCEL || |
+ !ChildProcessSecurityPolicyImpl::GetInstance()->CanRequestURL( |
jam
2016/10/21 20:28:20
it seems a bit odd to be checking process ID of sp
ananta
2016/10/21 21:08:29
nasko suggested using the siteinstance id for this
jam
2016/10/21 21:25:24
ah, in that case I think he meant doing
navigation
|
+ frame_tree_node()->current_frame_host()->GetProcess()->GetID(), |
+ common_params_.url)) { |
// TODO(clamy): distinguish between CANCEL and CANCEL_AND_IGNORE. |
frame_tree_node_->ResetNavigationRequest(false); |
return; |