[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 871a6652f0f359cd14f316b098c37ae5bc396aa6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 23 23:48:38 2010 +0000

    2010-08-23  Adam Barth  <abarth at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d2b23f3..a7bd75d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-23  Adam Barth  <abarth at 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 at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebCore/html/HTMLConstructionSite.cpp b/WebCore/html/HTMLConstructionSite.cpp
index 4c0207c..4908b23 100644
--- a/WebCore/html/HTMLConstructionSite.cpp
+++ b/WebCore/html/HTMLConstructionSite.cpp
@@ -290,7 +290,8 @@ void HTMLConstructionSite::insertFormattingElement(AtomicHTMLToken& token)
 void HTMLConstructionSite::insertScriptElement(AtomicHTMLToken& token)
 {
     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()));
 }
 
diff --git a/WebCore/html/HTMLTreeBuilder.cpp b/WebCore/html/HTMLTreeBuilder.cpp
index fd56dab..df49896 100644
--- a/WebCore/html/HTMLTreeBuilder.cpp
+++ b/WebCore/html/HTMLTreeBuilder.cpp
@@ -2398,6 +2398,8 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken& token)
             m_scriptToProcess = m_tree.currentElement();
             m_scriptToProcessStartLine = m_lastScriptElementStartLine + 1;
             m_tree.openElements()->pop();
+            if (isParsingFragment() && m_fragmentContext.scriptingPermission() == FragmentScriptingNotAllowed)
+                m_scriptToProcess->removeAllChildren();
             setInsertionMode(m_originalInsertionMode);
             return;
         }

-- 
WebKit Debian packaging