[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/khtml/html
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2004-12-29 23:48:39
Message-ID: 20041229234839.6F09D1BABD () office ! kde ! org
[Download RAW message or body]

CVS commit by carewolf: 

Merge ID_TEXT changes from WebCore. Fixes most of the odd problems I was 
seeing in the Mozilla DOM tests.


  M +8 -6      dtd.cpp   1.77


--- kdelibs/khtml/html/dtd.cpp  #1.76:1.77
@@ -311,4 +311,5 @@ static const ushort tag_list_0[] = {
 
 static const ushort tag_list_1[] = {
+    ID_TEXT,
     ID_P,
     ID_H1,
@@ -338,5 +339,4 @@ static const ushort tag_list_1[] = {
     ID_FIELDSET,
     ID_ADDRESS,
-    ID_TEXT,
     ID_TT,
     ID_I,
@@ -396,4 +396,5 @@ static const ushort tag_list_2[] = {
 
 static const ushort tag_list_3[] = {
+    ID_TEXT,
     ID_P,
     ID_H1,
@@ -431,4 +432,5 @@ static const ushort tag_list_3[] = {
 
 static const ushort tag_list_4[] = {
+    ID_TEXT,
     ID_PARAM,
     ID_P,
@@ -514,4 +516,5 @@ static const ushort tag_list_6[] = {
 
 static const ushort tag_list_7[] = {
+    ID_TEXT,
     ID_OPTGROUP,
     ID_OPTION,
@@ -530,4 +533,5 @@ static const ushort tag_list_10[] = {
 
 static const ushort tag_list_11[] = {
+    ID_TEXT,
     ID_SCRIPT,
     ID_STYLE,
@@ -620,10 +624,8 @@ bool DOM::checkChild(ushort tagID, ushor
     case ID_BODY:
         // BODY: _1 * + _2
-        if( check_array(childID, tag_list_1) ) return true;
-        return check_array(childID, tag_list_2);
+        return check_array(childID, tag_list_1) || check_array(childID, tag_list_2);
     case ID_ADDRESS:
         // ADDRESS: ( _0 | P ) *
-        if( check_array(childID, tag_list_0) ) return true;
-        return (childID == ID_P);
+        return check_array(childID, tag_list_0) || childID == ID_P;
     case ID_DT:
         if ( childID == ID_DL ) return false;


[prev in list] [next in list] [prev in thread] [next in thread]