Changeset 53845 in webkit

Timestamp:

Jan 26, 2010 2:04:15 AM (14 years ago)

Author:

Simon Hausmann

Message:

REGRESSION(r53835): Fix editing/pasteboard/paste-noscript-xhtml.xhtml
​https://bugs.webkit.org/show_bug.cgi?id=34157

Reviewed by Holger Freyther.

WebCore:

Pass the FragmentScriptingPermission correctly through to the DOM
and disallow scripting elements in parseEndElement(), similar to
the libxml tokenizer change in r53835.

• dom/XMLTokenizerQt.cpp:

(WebCore::handleElementNamespaces):
(WebCore::handleElementAttributes):
(WebCore::XMLTokenizer::parseStartElement):
(WebCore::XMLTokenizer::parseEndElement):

LayoutTests:

Add Qt specific result for this test that differs from the cross-platform
result in only one character: In htmlcontent.html the href attribute value
is ​http://www.cnn.com, which somehow becomes ​http://www.cnn.com/ in the cross
platform result. With the Qt xml parser that attribute is somehow preserved
and so our result does not have the trailing slash.

• platform/qt/editing/pasteboard/paste-noscript-xhtml-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/editing/pasteboard/paste-noscript-xhtml-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/XMLTokenizerQt.cpp (modified) (7 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-26  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        REGRESSION(r53835): Fix editing/pasteboard/paste-noscript-xhtml.xhtml
+        https://bugs.webkit.org/show_bug.cgi?id=34157
+
+        Add Qt specific result for this test that differs from the cross-platform
+        result in only one character: In htmlcontent.html the href attribute value
+        is http://www.cnn.com, which somehow becomes http://www.cnn.com/ in the cross
+        platform result. With the Qt xml parser that attribute is somehow preserved
+        and so our result does not have the trailing slash.
+
+        * platform/qt/editing/pasteboard/paste-noscript-xhtml-expected.txt: Added.
+
 2010-01-26  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-26  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        REGRESSION(r53835): Fix editing/pasteboard/paste-noscript-xhtml.xhtml
+        https://bugs.webkit.org/show_bug.cgi?id=34157
+
+        Pass the FragmentScriptingPermission correctly through to the DOM
+        and disallow scripting elements in parseEndElement(), similar to
+        the libxml tokenizer change in r53835.
+
+        * dom/XMLTokenizerQt.cpp:
+        (WebCore::handleElementNamespaces):
+        (WebCore::handleElementAttributes):
+        (WebCore::XMLTokenizer::parseStartElement):
+        (WebCore::XMLTokenizer::parseEndElement):
+
 2010-01-26  Garret Kelly  <gdk@chromium.org>
 

trunk/WebCore/dom/XMLTokenizerQt.cpp

@@ -325 +325 @@
 
 static inline void handleElementNamespaces(Element* newElement, const QXmlStreamNamespaceDeclarations &ns,
-                                           ExceptionCode& ec)
+                                           ExceptionCode& ec, FragmentScriptingPermission scriptingPermission)
 {
     for (int i = 0; i < ns.count(); ++i) {
@@ -331 +331 @@
         String namespaceURI = decl.namespaceUri();
         String namespaceQName = decl.prefix().isEmpty() ? String("xmlns") : String("xmlns:") + decl.prefix();
-        newElement->setAttributeNS("http://www.w3.org/2000/xmlns/", namespaceQName, namespaceURI, ec);
+        newElement->setAttributeNS("http://www.w3.org/2000/xmlns/", namespaceQName, namespaceURI, ec, scriptingPermission);
         if (ec) // exception setting attributes
             return;
@@ -337 +337 @@
 }
 
-static inline void handleElementAttributes(Element* newElement, const QXmlStreamAttributes &attrs, ExceptionCode& ec)
+static inline void handleElementAttributes(Element* newElement, const QXmlStreamAttributes &attrs, ExceptionCode& ec,
+                                           FragmentScriptingPermission scriptingPermission)
 {
     for (int i = 0; i < attrs.count(); ++i) {
@@ -345 +346 @@
         String attrURI       = attr.namespaceUri().isEmpty() ? String() : String(attr.namespaceUri());
         String attrQName     = attr.qualifiedName();
-        newElement->setAttributeNS(attrURI, attrQName, attrValue, ec);
+        newElement->setAttributeNS(attrURI, attrQName, attrValue, ec, scriptingPermission);
         if (ec) // exception setting attributes
             return;
@@ -505 +506 @@
 
     ExceptionCode ec = 0;
-    handleElementNamespaces(newElement.get(), m_stream.namespaceDeclarations(), ec);
+    handleElementNamespaces(newElement.get(), m_stream.namespaceDeclarations(), ec, m_scriptingPermission);
     if (ec) {
         stopParsing();
@@ -511 +512 @@
     }
 
-    handleElementAttributes(newElement.get(), m_stream.attributes(), ec);
+    handleElementAttributes(newElement.get(), m_stream.attributes(), ec, m_scriptingPermission);
     if (ec) {
         stopParsing();
@@ -540 +541 @@
     Node* n = m_currentNode;
     n->finishParsingChildren();
+
+    if (m_scriptingPermission == FragmentScriptingNotAllowed && n->isElementNode() && toScriptElement(static_cast<Element*>(n))) {
+        popCurrentNode();
+        ExceptionCode ec;
+        n->remove(ec);
+        return;
+    }
 
     if (!n->isElementNode() || !m_view) {