[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 c128619bee228f9399182818ef61fa45596a7525
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 26 23:43:16 2003 +0000

    	Fix for 3286229, popup menu misplaced.  <form> needs to be allowed as a child of
    	<h1>-<h6> tags.  All other browsers allow this.
    
            Reviewed by darin
    
            * khtml/html/dtd.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4891 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 529ed12..1a4ab99 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-08-26  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3286229, popup menu misplaced.  <form> needs to be allowed as a child of
+	<h1>-<h6> tags.  All other browsers allow this.
+	
+        Reviewed by darin
+
+        * khtml/html/dtd.cpp:
+
 2003-08-26  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 529ed12..1a4ab99 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-08-26  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3286229, popup menu misplaced.  <form> needs to be allowed as a child of
+	<h1>-<h6> tags.  All other browsers allow this.
+	
+        Reviewed by darin
+
+        * khtml/html/dtd.cpp:
+
 2003-08-26  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index d9433e5..8d94f06 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -594,7 +594,8 @@ bool DOM::checkChild(ushort tagID, ushort childID)
     case ID_H4:
     case ID_H5:
     case ID_H6:
-        if (childID == ID_TABLE || (tagID != ID_P && childID == ID_CENTER)) return true;
+        if (childID == ID_TABLE || (tagID != ID_P && (childID == ID_FORM || childID == ID_CENTER)))
+            return true;
         return check_array(childID, tag_list_0);
     case ID_BASEFONT:
     case ID_BR:

-- 
WebKit Debian packaging