diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/bindings/generic/BindingSecurity.h | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/bindings/generic/BindingSecurity.h')
| -rw-r--r-- | WebCore/bindings/generic/BindingSecurity.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/bindings/generic/BindingSecurity.h b/WebCore/bindings/generic/BindingSecurity.h index 1124f7e..1ce556c 100644 --- a/WebCore/bindings/generic/BindingSecurity.h +++ b/WebCore/bindings/generic/BindingSecurity.h @@ -32,12 +32,12 @@ #define BindingSecurity_h #include "BindingSecurityBase.h" -#include "CSSHelper.h" #include "Element.h" #include "Frame.h" #include "GenericBinding.h" #include "HTMLFrameElementBase.h" #include "HTMLNames.h" +#include "HTMLParserIdioms.h" #include "Settings.h" namespace WebCore { @@ -128,7 +128,7 @@ bool BindingSecurity<Binding>::allowPopUp(State<Binding>* state) template <class Binding> bool BindingSecurity<Binding>::allowSettingFrameSrcToJavascriptUrl(State<Binding>* state, HTMLFrameElementBase* frame, String value) { - if (protocolIsJavaScript(deprecatedParseURL(value))) { + if (protocolIsJavaScript(stripLeadingAndTrailingHTMLSpaces(value))) { Node* contentDoc = frame->contentDocument(); if (contentDoc && !checkNodeSecurity(state, contentDoc)) return false; |