[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 3862c857f01e2fe03ea2d8fc87e38c34b7fc5297
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 21 01:35:54 2003 +0000

    	Fix for 3147213.  <nobr> is treated like other inlines now,
    	so it can contain blocks.  <wbr> is also fixed.  This fixes
    	tvguide.com.
    
            Reviewed by john
    
            * khtml/html/dtd.cpp:
            (DOM::checkChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3360 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5b7ad35..eedd7f0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-01-20  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3147213.  <nobr> is treated like other inlines now,
+	so it can contain blocks.  <wbr> is also fixed.  This fixes
+	tvguide.com.
+	
+        Reviewed by john
+
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+
+2003-01-20  David Hyatt  <hyatt at apple.com>
+
 	Gah. Fix positioned objects and floating objects so that they
 	don't append themselves to the list of runs in normal flow.
 	An astoundingly basic bug. :(
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5b7ad35..eedd7f0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-01-20  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3147213.  <nobr> is treated like other inlines now,
+	so it can contain blocks.  <wbr> is also fixed.  This fixes
+	tvguide.com.
+	
+        Reviewed by john
+
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+
+2003-01-20  David Hyatt  <hyatt at apple.com>
+
 	Gah. Fix positioned objects and floating objects so that they
 	don't append themselves to the list of runs in normal flow.
 	An astoundingly basic bug. :(
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index d21a597..01384ac 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -590,6 +590,8 @@ bool DOM::checkChild(ushort tagID, ushort childID)
     case ID_LEGEND:
     case ID_FONT:
     case ID_A:
+    case ID_NOBR:
+    case ID_WBR:
         return check_array(childID, tag_list_1);
     case ID_P:
     case ID_H1:
@@ -620,8 +622,6 @@ bool DOM::checkChild(ushort tagID, ushort childID)
         // BODY: _1 * + _2
         if( check_array(childID, tag_list_1) ) return true;
         return check_array(childID, tag_list_2);
-    case ID_NOBR:
-    case ID_WBR:
     case ID_ADDRESS:
         // ADDRESS: ( _0 | P ) *
         if( check_array(childID, tag_list_0) ) return true;

-- 
WebKit Debian packaging