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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit c054e2c1305a580cd33933561b421049c9ad9fc3
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 3 22:46:18 2002 +0000

    	Fix for 3112599, aol.com shopping page doesn't work.  Apply
    	the same form demotion trick to <tr> that I did already for
    	<tbody> and <table>.
    
    	r=gramps
    
            * khtml/html/dtd.cpp:
            (DOM::checkChild):
            * khtml/html/html_tableimpl.cpp:
            (HTMLTableRowElementImpl::addChild):
            * khtml/html/html_tableimpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 39d801b..b630f38 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,19 @@
 2002-12-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3112599, aol.com shopping page doesn't work.  Apply
+	the same form demotion trick to <tr> that I did already for
+	<tbody> and <table>.
+
+	r=gramps
+	
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableRowElementImpl::addChild):
+        * khtml/html/html_tableimpl.h:
+
+2002-12-03  David Hyatt  <hyatt at apple.com>
+
 	Fix link feedback regression on aintitcool.com.  Observe
 	the wacky feedback we give now (yes, it matches MacIE and
 	Gecko).  Gotta love this malformed page.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 39d801b..b630f38 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,19 @@
 2002-12-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3112599, aol.com shopping page doesn't work.  Apply
+	the same form demotion trick to <tr> that I did already for
+	<tbody> and <table>.
+
+	r=gramps
+	
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableRowElementImpl::addChild):
+        * khtml/html/html_tableimpl.h:
+
+2002-12-03  David Hyatt  <hyatt at apple.com>
+
 	Fix link feedback regression on aintitcool.com.  Observe
 	the wacky feedback we give now (yes, it matches MacIE and
 	Gecko).  Gotta love this malformed page.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 39d801b..b630f38 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,19 @@
 2002-12-03  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3112599, aol.com shopping page doesn't work.  Apply
+	the same form demotion trick to <tr> that I did already for
+	<tbody> and <table>.
+
+	r=gramps
+	
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+        * khtml/html/html_tableimpl.cpp:
+        (HTMLTableRowElementImpl::addChild):
+        * khtml/html/html_tableimpl.h:
+
+2002-12-03  David Hyatt  <hyatt at apple.com>
+
 	Fix link feedback regression on aintitcool.com.  Observe
 	the wacky feedback we give now (yes, it matches MacIE and
 	Gecko).  Gotta love this malformed page.
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index 8f52588..d8fc784 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -739,7 +739,7 @@ bool DOM::checkChild(ushort tagID, ushort childID)
         return false;
     case ID_TR:
         // TR: _9 +
-        if (childID == ID_SCRIPT)
+        if (childID == ID_SCRIPT || childID == ID_FORM)
             return true;
         return check_array(childID, tag_list_9);
     case ID_FRAMESET:
diff --git a/WebCore/khtml/html/html_tableimpl.cpp b/WebCore/khtml/html/html_tableimpl.cpp
index 939ee07..d8e9efd 100644
--- a/WebCore/khtml/html/html_tableimpl.cpp
+++ b/WebCore/khtml/html/html_tableimpl.cpp
@@ -624,6 +624,22 @@ NodeImpl::Id HTMLTableRowElementImpl::id() const
     return ID_TR;
 }
 
+NodeImpl *HTMLTableRowElementImpl::addChild(NodeImpl *child)
+{
+#ifdef DEBUG_LAYOUT
+    kdDebug( 6030 ) << nodeName().string() << "(Tbody)::addChild( " << child->nodeName().string() << " )" << endl;
+#endif
+
+    if (child->id() == ID_FORM) {
+        // First add the child.
+        HTMLElementImpl::addChild(child);
+        // Now simply return ourselves as the newnode.  This has the effect of
+        // demoting the form to a leaf and moving it safely out of the way.
+        return this;
+    }
+    return HTMLTablePartElementImpl::addChild(child);
+}
+
 long HTMLTableRowElementImpl::rowIndex() const
 {
     // some complex traversal stuff here to take into account that some rows may be in different sections
diff --git a/WebCore/khtml/html/html_tableimpl.h b/WebCore/khtml/html/html_tableimpl.h
index 123f4f7..e494b5e 100644
--- a/WebCore/khtml/html/html_tableimpl.h
+++ b/WebCore/khtml/html/html_tableimpl.h
@@ -170,6 +170,8 @@ public:
 
     virtual Id id() const;
 
+    virtual NodeImpl *addChild(NodeImpl *child);
+    
     long rowIndex() const;
     long sectionRowIndex() const;
 

-- 
WebKit Debian packaging