From be01689f43cf6882cf670d33df49ead1f570c53a Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 27 May 2012 21:51:42 +0200 Subject: Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6 (http://svn.webkit.org/repository/webkit/trunk@118629) --- Source/WebCore/bindings/ScriptControllerBase.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/bindings/ScriptControllerBase.cpp') diff --git a/Source/WebCore/bindings/ScriptControllerBase.cpp b/Source/WebCore/bindings/ScriptControllerBase.cpp index 855158afc..9b006d2c2 100644 --- a/Source/WebCore/bindings/ScriptControllerBase.cpp +++ b/Source/WebCore/bindings/ScriptControllerBase.cpp @@ -32,6 +32,7 @@ #include "SecurityOrigin.h" #include "Settings.h" #include "UserGestureIndicator.h" +#include namespace WebCore { @@ -75,7 +76,7 @@ bool ScriptController::executeIfJavaScriptURL(const KURL& url, ShouldReplaceDocu if (!m_frame->page() || !m_frame->page()->javaScriptURLsAreAllowed() - || !m_frame->document()->contentSecurityPolicy()->allowJavaScriptURLs() + || !m_frame->document()->contentSecurityPolicy()->allowJavaScriptURLs(m_frame->document()->url(), eventHandlerPosition().m_line) || m_frame->inViewSourceMode()) return true; -- cgit v1.2.1