summaryrefslogtreecommitdiffstats
path: root/content/browser/frame_host
diff options
context:
space:
mode:
authorjochen <jochen@chromium.org>2015-07-27 03:23:11 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-27 10:24:04 +0000
commitfbe5373351f032108f9d2ec0053789b0fa560c56 (patch)
treee4245b5552f9e371a7c87ae7d3771fce0a1647b3 /content/browser/frame_host
parent2c83864854272e5f6fa2ddec7d3f6f44c4ee1eb2 (diff)
downloadchromium_src-fbe5373351f032108f9d2ec0053789b0fa560c56.zip
chromium_src-fbe5373351f032108f9d2ec0053789b0fa560c56.tar.gz
chromium_src-fbe5373351f032108f9d2ec0053789b0fa560c56.tar.bz2
Ignore javascript send to not yet navigated frames
BUG=514113 R=mkwst@chromium.org Review URL: https://codereview.chromium.org/1253353002 Cr-Commit-Position: refs/heads/master@{#340445}
Diffstat (limited to 'content/browser/frame_host')
-rw-r--r--content/browser/frame_host/render_frame_host_impl.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 9c844cf..06d7e0e 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2165,6 +2165,7 @@ void RenderFrameHostImpl::UpdatePermissionsForNavigation(
bool RenderFrameHostImpl::CanExecuteJavaScript() {
return g_allow_injecting_javascript ||
+ !frame_tree_node_->current_url().is_valid() ||
frame_tree_node_->current_url().SchemeIs(kChromeDevToolsScheme) ||
ChildProcessSecurityPolicyImpl::GetInstance()->HasWebUIBindings(
GetProcess()->GetID()) ||