Changeset 65843 in webkit

Timestamp:

Aug 23, 2010 4:48:38 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-08-23 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

editing/pasteboard/paste-visible-script.html is broken with --html5-treebuilder
​https://bugs.webkit.org/show_bug.cgi?id=44457

Turns out there are two more checks we need for fragment scripting
permission. Not the most beautiful design, but it seems work.

• html/HTMLConstructionSite.cpp: (WebCore::HTMLConstructionSite::insertScriptElement):
• html/HTMLTreeBuilder.cpp: (WebCore::HTMLTreeBuilder::processEndTag):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLConstructionSite.cpp (modified) (1 diff)
• html/HTMLTreeBuilder.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-23  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        editing/pasteboard/paste-visible-script.html is broken with --html5-treebuilder
+        https://bugs.webkit.org/show_bug.cgi?id=44457
+
+        Turns out there are two more checks we need for fragment scripting
+        permission.  Not the most beautiful design, but it seems work.
+
+        * html/HTMLConstructionSite.cpp:
+        (WebCore::HTMLConstructionSite::insertScriptElement):
+        * html/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processEndTag):
+
 2010-08-23  Eric Seidel  <eric@webkit.org>
 

trunk/WebCore/html/HTMLConstructionSite.cpp

@@ -291 +291 @@
 {
     RefPtr<HTMLScriptElement> element = HTMLScriptElement::create(scriptTag, m_document, true);
-    element->setAttributeMap(token.takeAtributes(), m_fragmentScriptingPermission);
+    if (m_fragmentScriptingPermission == FragmentScriptingAllowed)
+        element->setAttributeMap(token.takeAtributes(), m_fragmentScriptingPermission);
     m_openElements.push(attachToCurrent(element.release()));
 }

trunk/WebCore/html/HTMLTreeBuilder.cpp

@@ -2399 +2399 @@
             m_scriptToProcessStartLine = m_lastScriptElementStartLine + 1;
             m_tree.openElements()->pop();
+            if (isParsingFragment() && m_fragmentContext.scriptingPermission() == FragmentScriptingNotAllowed)
+                m_scriptToProcess->removeAllChildren();
             setInsertionMode(m_originalInsertionMode);
             return;