[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 04a6340a765aff293d329a44d751e70a09d2da1c
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Apr 3 20:15:28 2004 +0000

    	Fix for 3601728, text overlaps borders at ejai.org.  Remove all the code in addForbidden for
    	dir, menu, nobr, and pre that made them too restrictive regarding what child tags they could
    	contain.
    
            Reviewed by kocienda
    
            * khtml/html/dtd.cpp:
            (DOM::addForbidden):
            (DOM::removeForbidden):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6308 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d6ef02d..5833585 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2004-04-03  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3601728, text overlaps borders at ejai.org.  Remove all the code in addForbidden for
+	dir, menu, nobr, and pre that made them too restrictive regarding what child tags they could
+	contain.
+	
+        Reviewed by kocienda
+
+        * khtml/html/dtd.cpp:
+        (DOM::addForbidden):
+        (DOM::removeForbidden):
+
 2004-04-02  Chris Blumenberg  <cblu at apple.com>
 
 	Moved the DOM extensions to their own headers
diff --git a/WebCore/khtml/html/dtd.cpp b/WebCore/khtml/html/dtd.cpp
index b428810..b08c6ab 100644
--- a/WebCore/khtml/html/dtd.cpp
+++ b/WebCore/khtml/html/dtd.cpp
@@ -763,60 +763,6 @@ void DOM::addForbidden(int tagId, ushort *forbiddenTags)
 {
     switch(tagId)
     {
-    case ID_A:
-        // we allow nested anchors. The innermost one wil be taken...
-        //forbiddenTags[ID_A]++;
-        break;
-    case ID_NOBR:
-        forbiddenTags[ID_PRE]++;
-        // fall through
-    case ID_PRE:
-    case ID_PLAINTEXT:
-    case ID_XMP:
-        //forbiddenTags[ID_IMG]++;
-        forbiddenTags[ID_OBJECT]++;
-        forbiddenTags[ID_EMBED]++;
-        forbiddenTags[ID_APPLET]++;
-        // why forbid them. We can deal with them in PRE
-        //forbiddenTags[ID_BIG]++;
-        //forbiddenTags[ID_SMALL]++;
-        //forbiddenTags[ID_SUB]++;
-        //forbiddenTags[ID_SUP]++;
-        forbiddenTags[ID_BASEFONT]++;
-        break;
-    case ID_DIR:
-    case ID_MENU:
-        forbiddenTags[ID_P]++;
-        forbiddenTags[ID_H1]++;
-        forbiddenTags[ID_H2]++;
-        forbiddenTags[ID_H3]++;
-        forbiddenTags[ID_H4]++;
-        forbiddenTags[ID_H5]++;
-        forbiddenTags[ID_H6]++;
-        forbiddenTags[ID_UL]++;
-        forbiddenTags[ID_OL]++;
-        forbiddenTags[ID_DIR]++;
-        forbiddenTags[ID_MENU]++;
-        forbiddenTags[ID_PRE]++;
-        forbiddenTags[ID_PLAINTEXT]++;
-        forbiddenTags[ID_XMP]++;
-        forbiddenTags[ID_DL]++;
-        forbiddenTags[ID_DIV]++;
-        forbiddenTags[ID_CENTER]++;
-        forbiddenTags[ID_NOSCRIPT]++;
-        forbiddenTags[ID_NOFRAMES]++;
-        forbiddenTags[ID_BLOCKQUOTE]++;
-        forbiddenTags[ID_FORM]++;
-        forbiddenTags[ID_ISINDEX]++;
-        forbiddenTags[ID_HR]++;
-        forbiddenTags[ID_TABLE]++;
-        forbiddenTags[ID_FIELDSET]++;
-        forbiddenTags[ID_ADDRESS]++;
-        break;
-    case ID_FORM:
-        // the parser deals with them in another way. helps supporting some broken html
-        //forbiddenTags[ID_FORM]++;
-        break;
     case ID_LABEL:
         forbiddenTags[ID_LABEL]++;
         break;
@@ -841,57 +787,6 @@ void DOM::removeForbidden(int tagId, ushort *forbiddenTags)
 {
     switch(tagId)
     {
-    case ID_A:
-        //forbiddenTags[ID_A]--;
-        break;
-    case ID_NOBR:
-        forbiddenTags[ID_PRE]--;
-        // fall through
-    case ID_PRE:
-    case ID_XMP:
-    case ID_PLAINTEXT:
-        //forbiddenTags[ID_IMG]--;
-        forbiddenTags[ID_OBJECT]--;
-        forbiddenTags[ID_EMBED]--;
-        forbiddenTags[ID_APPLET]--;
-        //forbiddenTags[ID_BIG]--;
-        //forbiddenTags[ID_SMALL]--;
-        //forbiddenTags[ID_SUB]--;
-        //forbiddenTags[ID_SUP]--;
-        forbiddenTags[ID_BASEFONT]--;
-        break;
-    case ID_DIR:
-    case ID_MENU:
-        forbiddenTags[ID_P]--;
-        forbiddenTags[ID_H1]--;
-        forbiddenTags[ID_H2]--;
-        forbiddenTags[ID_H3]--;
-        forbiddenTags[ID_H4]--;
-        forbiddenTags[ID_H5]--;
-        forbiddenTags[ID_H6]--;
-        forbiddenTags[ID_UL]--;
-        forbiddenTags[ID_OL]--;
-        forbiddenTags[ID_DIR]--;
-        forbiddenTags[ID_MENU]--;
-        forbiddenTags[ID_PRE]--;
-        forbiddenTags[ID_PLAINTEXT]--;
-        forbiddenTags[ID_XMP]--;
-        forbiddenTags[ID_DL]--;
-        forbiddenTags[ID_DIV]--;
-        forbiddenTags[ID_CENTER]--;
-        forbiddenTags[ID_NOSCRIPT]--;
-        forbiddenTags[ID_NOFRAMES]--;
-        forbiddenTags[ID_BLOCKQUOTE]--;
-        forbiddenTags[ID_FORM]--;
-        forbiddenTags[ID_ISINDEX]--;
-        forbiddenTags[ID_HR]--;
-        forbiddenTags[ID_TABLE]--;
-        forbiddenTags[ID_FIELDSET]--;
-        forbiddenTags[ID_ADDRESS]--;
-        break;
-    case ID_FORM:
-        //forbiddenTags[ID_FORM]--;
-        break;
     case ID_LABEL:
         forbiddenTags[ID_LABEL]--;
         break;

-- 
WebKit Debian packaging