diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/bindings/ScriptControllerBase.cpp | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/bindings/ScriptControllerBase.cpp')
| -rw-r--r-- | Source/WebCore/bindings/ScriptControllerBase.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/WebCore/bindings/ScriptControllerBase.cpp b/Source/WebCore/bindings/ScriptControllerBase.cpp index e128d11..fbf6d3e 100644 --- a/Source/WebCore/bindings/ScriptControllerBase.cpp +++ b/Source/WebCore/bindings/ScriptControllerBase.cpp @@ -21,6 +21,7 @@ #include "config.h" #include "ScriptController.h" +#include "DocumentLoader.h" #include "Frame.h" #include "FrameLoaderClient.h" #include "Page.h" @@ -71,13 +72,10 @@ bool ScriptController::executeIfJavaScriptURL(const KURL& url, ShouldReplaceDocu if (!protocolIsJavaScript(url)) return false; - if (!m_frame->page()) - return true; - - if (!m_frame->page()->javaScriptURLsAreAllowed()) - return true; - - if (m_frame->inViewSourceMode()) + if (!m_frame->page() + || !m_frame->page()->javaScriptURLsAreAllowed() + || !m_frame->document()->contentSecurityPolicy()->allowJavaScriptURLs() + || m_frame->inViewSourceMode()) return true; // We need to hold onto the Frame here because executing script can |