[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 03865b3b33390ca5f9b96b9b1449296e7b2433e6
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 11 01:12:41 2003 +0000

    	Fix for 3473531, text nested in hr inside h3 did not get the h3's style.
    
            Reviewed by darin
    
            * khtml/html/dtd.cpp:
            (DOM::checkChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5451 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f74397f..1c9eaff 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-11-10  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3473531, text nested in hr inside h3 did not get the h3's style.
+	
+        Reviewed by darin
+
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+
+2003-11-10  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3478435, <hr> tags should be centered by default.  Ditched the 1px margin as well.
 
 	Fix for 3479441, <h1>-<h6> tags should *not* be centered by default.  They should also use bold instead of
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index 8d94f06..bce4f76 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -594,7 +594,7 @@ 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_FORM || childID == ID_CENTER)))
+        if (childID == ID_TABLE || (tagID != ID_P && (childID == ID_FORM || childID == ID_CENTER || childID == ID_HR)))
             return true;
         return check_array(childID, tag_list_0);
     case ID_BASEFONT:

-- 
WebKit Debian packaging