Index: Source/WebCore/dom/Element.cpp |
=================================================================== |
--- Source/WebCore/dom/Element.cpp (revision 148876) |
+++ Source/WebCore/dom/Element.cpp (working copy) |
@@ -1039,29 +1039,18 @@ |
return attribute.name().namespaceURI().isNull() && attribute.name().localName().startsWith("on"); |
} |
-bool Element::isJavaScriptURLAttribute(const Attribute& attribute) |
+bool Element::isJavaScriptURLAttribute(const Attribute& attribute) const |
{ |
- if (!isURLAttribute(attribute)) |
- return false; |
- if (!protocolIsJavaScript(stripLeadingAndTrailingHTMLSpaces(attribute.value()))) |
- return false; |
- return true; |
+ return isURLAttribute(attribute) && protocolIsJavaScript(stripLeadingAndTrailingHTMLSpaces(attribute.value())); |
} |
-bool Element::isJavaScriptAttribute(const Attribute& attribute) |
+void Element::stripScriptingAttributes(Vector<Attribute>& attributeVector) const |
{ |
- if (isEventHandlerAttribute(attribute)) |
- return true; |
- if (isJavaScriptURLAttribute(attribute)) |
- return true; |
- return false; |
-} |
- |
-void Element::stripJavaScriptAttributes(Vector<Attribute>& attributeVector) |
-{ |
size_t destination = 0; |
for (size_t source = 0; source < attributeVector.size(); ++source) { |
- if (isJavaScriptAttribute(attributeVector[source])) |
+ if (isEventHandlerAttribute(attributeVector[source]) |
+ || isJavaScriptURLAttribute(attributeVector[source]) |
+ || isHTMLContentAttribute(attributeVector[source])) |
continue; |
if (source != destination) |