[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 091f261a2f9eb1dcfdb883db59e6ac337d0c40e6
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 14 17:50:46 2004 +0000

            Reviewed by Darin
    
            Fix for this bug:
    
            <rdar://problem/3672377> assertion failure in AppendNodeCommandImpl::doApply due to non-0 exception code trying to insert a DIV markup string
    
            * khtml/xml/dom_nodeimpl.cpp:
            (NodeImpl::checkAddChild): This function was being too strict in disallowing certain nodes
            to be added as other child nodes, applying rules we typically use for parsing. However,
            those parsing rules are primarily for dealing with "bad" HTML, and should not be
            applied to programmatic DOM operations. The fix involves removing calls to childAllowed().
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6823 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5ea8608..b22ac4a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2004-06-14  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+        Fix for this bug:
+        
+        <rdar://problem/3672377> assertion failure in AppendNodeCommandImpl::doApply due to non-0 exception code trying to insert a DIV markup string
+        
+        * khtml/xml/dom_nodeimpl.cpp:
+        (NodeImpl::checkAddChild): This function was being too strict in disallowing certain nodes
+        to be added as other child nodes, applying rules we typically use for parsing. However,
+        those parsing rules are primarily for dealing with "bad" HTML, and should not be
+        applied to programmatic DOM operations. The fix involves removing calls to childAllowed().
+
 2004-06-12  Trey Matteson  <trey at apple.com>
 
 	The drag image may be updated during a DHTML drag.  This includes updating
diff --git a/WebCore/khtml/xml/dom_nodeimpl.cpp b/WebCore/khtml/xml/dom_nodeimpl.cpp
index a2b4ff7..5449cb2 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.cpp
+++ b/WebCore/khtml/xml/dom_nodeimpl.cpp
@@ -1002,25 +1002,6 @@ void NodeImpl::checkAddChild(NodeImpl *newChild, int &exceptioncode)
         return;
     }
 
-    // check node allowed
-    if (newChild->nodeType() == Node::DOCUMENT_FRAGMENT_NODE) {
-        // newChild is a DocumentFragment... check all it's children instead of newChild itself
-        NodeImpl *child;
-        for (child = newChild->firstChild(); child; child = child->nextSibling()) {
-            if (!childAllowed(child)) {
-                exceptioncode = DOMException::HIERARCHY_REQUEST_ERR;
-                return;
-            }
-        }
-    }
-    else {
-        // newChild is not a DocumentFragment... check if it's allowed directly
-        if(!childAllowed(newChild)) {
-            exceptioncode = DOMException::HIERARCHY_REQUEST_ERR;
-            return;
-        }
-    }
-
     // only do this once we know there won't be an exception
     if (shouldAdoptChild) {
 	KJS::ScriptInterpreter::updateDOMObjectDocument(newChild, newChild->getDocument(), getDocument());

-- 
WebKit Debian packaging