Changeset 57316

Timestamp:

01/19/2024 09:40:01 PM (6 months ago)

Author:

dmsnell

Message:

HTML API: Add support for BR, EMBED, & other tags.

Adds support for the following HTML elements to the HTML Processor:

• AREA, BR, EMBED, KEYGEN, WBR
• Only the opening BR tag is supported, as the invalid closer </br> involves more complicated rules, to be implemented later.

Previously, these elements were not supported and the HTML Processor
would bail when encountering them. With this patch it will proceed to
parse an HTML document when encountering those tags as long as other
normal conditions don't cause it to bail (such as complicated format
reconstruction rules).

Props jonsurrell, dmsnell
Fixes #60283

Location:

trunk

Files:

• src/wp-includes/html-api/class-wp-html-processor.php (modified) (7 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessor.php (modified) (4 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php (modified) (3 diffs)
• tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php (modified) (1 diff)

trunk/src/wp-includes/html-api/class-wp-html-processor.php

@@ -103 +103 @@
  *  - Custom elements: All custom elements are supported. :)
  *  - Form elements: BUTTON, DATALIST, FIELDSET, LABEL, LEGEND, METER, PROGRESS, SEARCH.
- *  - Formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U.
+ *  - Formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U.
  *  - Heading elements: H1, H2, H3, H4, H5, H6, HGROUP.
  *  - Links: A.
  *  - Lists: DD, DL, DT, LI, OL, LI.
- *  - Media elements: AUDIO, CANVAS, FIGCAPTION, FIGURE, IMG, MAP, PICTURE, VIDEO.
- *  - Paragraph: P.
- *  - Phrasing elements: ABBR, BDI, BDO, CITE, DATA, DEL, DFN, INS, MARK, OUTPUT, Q, SAMP, SUB, SUP, TIME, VAR.
+ *  - Media elements: AUDIO, CANVAS, FIGCAPTION, FIGURE, IMG, MAP, PICTURE, VIDEO.
+ *  - Paragraph: P.
+ *  - Phrasing elements: ABBR, BDI, BDO, CITE, DATA, DEL, DFN, INS, MARK, OUTPUT, Q, SAMP, SUB, SUP, TIME, VAR.
  *  - Sectioning elements: ARTICLE, ASIDE, HR, NAV, SECTION.
  *  - Templating elements: SLOT.
  *  - Text decoration: RUBY.
- *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, MULTICOL, NEXTID, SPACER.
+ *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, MULTICOL, NEXTID, SPACER.
  *
  * ### Supported markup
@@ -936 +936 @@
 
             /*
+
+
+
+
+
+
+
+
+
+
              * > A start tag whose tag name is one of: "area", "br", "embed", "img", "keygen", "wbr"
              */
+
+
+
             case '+IMG':
+
+
                 $this->reconstruct_active_formatting_elements();
                 $this->insert_html_element( $this->state->current_token );
+
                 return true;
 
@@ -978 +994 @@
             case 'BGSOUND':
             case 'BODY':
-            case 'BR':
             case 'CAPTION':
             case 'COL':
@@ -984 +999 @@
             case 'DD':
             case 'DT':
-            case 'EMBED':
             case 'FORM':
             case 'FRAME':
@@ -992 +1006 @@
             case 'IFRAME':
             case 'INPUT':
-            case 'KEYGEN':
             case 'LI':
             case 'LINK':
@@ -1032 +1045 @@
             case 'TRACK':
             case 'UL':
-            case 'WBR':
             case 'XMP':
                 $this->last_error = self::ERROR_UNSUPPORTED;
@@ -1693 +1705 @@
             'INPUT' === $tag_name ||
             'LINK' === $tag_name ||
+
             'META' === $tag_name ||
             'SOURCE' === $tag_name ||

trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php

@@ -134 +134 @@
 
     /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      * Ensures that special handling of unsupported tags is cleaned up
      * as handling is implemented. Otherwise there's risk of leaving special
@@ -160 +240 @@
         return array(
             'APPLET'    => array( 'APPLET' ),
-            'AREA'      => array( 'AREA' ),
             'BASE'      => array( 'BASE' ),
             'BASEFONT'  => array( 'BASEFONT' ),
             'BGSOUND'   => array( 'BGSOUND' ),
             'BODY'      => array( 'BODY' ),
-            'BR'        => array( 'BR' ),
             'CAPTION'   => array( 'CAPTION' ),
             'COL'       => array( 'COL' ),
             'COLGROUP'  => array( 'COLGROUP' ),
-            'EMBED'     => array( 'EMBED' ),
             'FORM'      => array( 'FORM' ),
             'FRAME'     => array( 'FRAME' ),
@@ -177 +254 @@
             'IFRAME'    => array( 'IFRAME' ),
             'INPUT'     => array( 'INPUT' ),
-            'KEYGEN'    => array( 'KEYGEN' ),
             'LINK'      => array( 'LINK' ),
             'LISTING'   => array( 'LISTING' ),
@@ -214 +290 @@
             'TR'        => array( 'TR' ),
             'TRACK'     => array( 'TRACK' ),
-            'WBR'       => array( 'WBR' ),
             'XMP'       => array( 'XMP' ),
         );

trunk/tests/phpunit/tests/html-api/wpHtmlProcessorBreadcrumbs.php

@@ -163 +163 @@
         $unsupported_elements = array(
             'APPLET', // Deprecated.
-            'AREA',
             'BASE',
             'BGSOUND', // Deprecated; self-closing if self-closing flag provided, otherwise normal.
             'BODY',
-            'BR',
             'CAPTION',
             'COL',
             'COLGROUP',
-            'EMBED',
             'FORM',
             'FRAME',
@@ -179 +176 @@
             'IFRAME',
             'INPUT',
-            'KEYGEN', // Deprecated; void.
             'LINK',
             'LISTING', // Deprecated, use PRE instead.
@@ -214 +210 @@
             'TR',
             'TRACK',
-            'WBR',
             'XMP', // Deprecated, use PRE instead.
         );

trunk/tests/phpunit/tests/html-api/wpHtmlProcessorSemanticRules.php

@@ -393 +393 @@
         $this->assertSame( array( 'HTML', 'BODY', 'DIV', 'DIV' ), $p->get_breadcrumbs(), 'Failed to produce expected DOM nesting: SPAN should be closed and DIV should be its sibling.' );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }