Changeset 7701 in webkit

Timestamp:

Sep 27, 2004 5:57:52 PM (20 years ago)

Author:

hyatt

Message:

ChangeLog

Location:

trunk/WebCore/khtml/html

Files:

• htmlparser.cpp (modified) (2 diffs)
• htmlparser.h (modified) (1 diff)

trunk/WebCore/khtml/html/htmlparser.cpp

@@ -254 +254 @@
         if(endTag[e->id()] == DOM::OPTIONAL)
             popBlock(t->id);
+            
+        if (isHeaderTag(t->id))
+            // Do not allow two header tags to be nested if the intervening tags are inlines.
+            popNestedHeaderTag();
     }
 
@@ -1200 +1204 @@
 }
 
+bool KHTMLParser::isHeaderTag(int _id)
+{
+    switch (_id) {
+        case ID_H1:
+        case ID_H2:
+        case ID_H3:
+        case ID_H4:
+        case ID_H5:
+        case ID_H6:
+            return true;
+        default:
+            return false;
+    }
+}
+
+void KHTMLParser::popNestedHeaderTag()
+{
+    // This function only cares about checking for nested headers that have only inlines in between them.
+    NodeImpl* currNode = current;
+    for (HTMLStackElem* curr = blockStack; curr; curr = curr->next) {
+        if (isHeaderTag(curr->id)) {
+            popBlock(curr->id);
+            return;
+        }
+        if (currNode && !currNode->isInline())
+            return;
+        currNode = curr->node;
+    }
+}
+
 bool KHTMLParser::isResidualStyleTag(int _id)
 {

trunk/WebCore/khtml/html/htmlparser.h

@@ -136 +136 @@
     bool allowNestedRedundantTag(int _id);
     
+    static bool isHeaderTag(int _id);
+    void popNestedHeaderTag();
+
     ushort *forbiddenTag;