[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 5092dd7cd9301c73587b7b1cdb94ce20dc73a30b
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 8 23:35:58 2004 +0000

    	Fix for 3519003, crash in mail because <dir> and <menu> don't allow the same children as <ul> and <ol>.
    
            Reviewed by darin
    
            * khtml/html/dtd.cpp:
            (DOM::checkChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7dac2be..fcfe2d7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-01-08  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3519003, crash in mail because <dir> and <menu> don't allow the same children as <ul> and <ol>.
+	
+        Reviewed by darin
+
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+
 2004-01-08  John Sullivan  <sullivan at apple.com>
 
         - fixed <rdar://problem/3524359>: REGRESSSION (119-120): 
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index f9527d8..b428810 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -638,6 +638,8 @@ bool DOM::checkChild(ushort tagID, ushort childID)
     case ID_MARQUEE:
     case ID_UL:
     case ID_OL:
+    case ID_DIR:
+    case ID_MENU:
         // DIV: _1 *
         return check_array(childID, tag_list_1);
     case ID_MAP:
@@ -659,11 +661,6 @@ bool DOM::checkChild(ushort tagID, ushort childID)
     case ID_DL:
         // DL: _6 +
         return check_array(childID, tag_list_1);
-    case ID_DIR:
-    case ID_MENU:
-        // (DIR|MENU): LI + - _3
-        if(childID == ID_LI) return true;
-        return false;
     case ID_FORM:
         // FORM: _1 * - FORM
         return check_array(childID, tag_list_1);

-- 
WebKit Debian packaging