[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 c0f5cb669c9b9bdc0f91a95632a3d8ea7b84f5ba
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 22 01:26:22 2002 +0000

    	Fix <font> so that behaves just like <i>, <b>, etc. Stop
    	the (incorrect) allowance of blocks inside <font> tags.
    	This fixes the mispositioning on avoyagetoarcturus.blogspot.com
    	and fixes the vertical gaps on www.ve3d.com.
    
            * khtml/html/dtd.cpp:
            (DOM::checkChild):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2814 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 329b299..31e16b7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-11-21  David Hyatt  <hyatt at apple.com>
+
+	Fix <font> so that behaves just like <i>, <b>, etc. Stop
+	the (incorrect) allowance of blocks inside <font> tags.
+	This fixes the mispositioning on avoyagetoarcturus.blogspot.com
+	and fixes the vertical gaps on www.ve3d.com.
+	
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+
 2002-11-21  Maciej Stachowiak  <mjs at apple.com>
 
         * Makefile.am: Pass symroots for this tree to pbxbuild.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 329b299..31e16b7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-11-21  David Hyatt  <hyatt at apple.com>
+
+	Fix <font> so that behaves just like <i>, <b>, etc. Stop
+	the (incorrect) allowance of blocks inside <font> tags.
+	This fixes the mispositioning on avoyagetoarcturus.blogspot.com
+	and fixes the vertical gaps on www.ve3d.com.
+	
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+
 2002-11-21  Maciej Stachowiak  <mjs at apple.com>
 
         * Makefile.am: Pass symroots for this tree to pbxbuild.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 329b299..31e16b7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-11-21  David Hyatt  <hyatt at apple.com>
+
+	Fix <font> so that behaves just like <i>, <b>, etc. Stop
+	the (incorrect) allowance of blocks inside <font> tags.
+	This fixes the mispositioning on avoyagetoarcturus.blogspot.com
+	and fixes the vertical gaps on www.ve3d.com.
+	
+        * khtml/html/dtd.cpp:
+        (DOM::checkChild):
+
 2002-11-21  Maciej Stachowiak  <mjs at apple.com>
 
         * Makefile.am: Pass symroots for this tree to pbxbuild.
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index 6478870..53e95e5 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -570,6 +570,7 @@ bool DOM::checkChild(ushort tagID, ushort childID)
 
     switch(tagID)
     {
+    case ID_FONT:
     case ID_TT:
     case ID_I:
     case ID_B:
@@ -630,9 +631,6 @@ bool DOM::checkChild(ushort tagID, ushort childID)
         // ADDRESS: ( _0 | P ) *
         if( check_array(childID, tag_list_0) ) return true;
         return (childID == ID_P);
-    case ID_FONT:
-        // special handling for FONT: (_0 | 3)
-        return check_array(childID, tag_list_3) || check_array(childID, tag_list_0);
     case ID__KONQBLOCK:
         if ( childID == ID__KONQBLOCK ) return false;
         // Fall through!

-- 
WebKit Debian packaging