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

Timestamp:

09/12/2023 03:10:19 PM (13 months ago)

Author:

Bernhard Reiter

Message:

HTML API: Store current token reference in HTML Processor state.

The $current_token reference has been stored in the HTML Processor itself, but I suggested to move it into the externalized state so that it can be stored and replaced.

In this patch the reference is moved to that state variable and it should become more possible to save and load state, to resume execution after pausing.

Props dmsnell.
Fixes #59268.

File:

• trunk/src/wp-includes/html-api/class-wp-html-processor.php (modified) (11 diffs)

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

@@ -164 +164 @@
      */
     private $bookmark_counter = 0;
-
-    /**
-     * Refers to the currently-matched tag, if any.
-     *
-     * @since 6.4.0
-     *
-     * @var WP_HTML_Token|null
-     */
-    private $current_token = null;
 
     /**
@@ -452 +443 @@
         }
 
-        $this->current_token = new WP_HTML_Token(
+        $this->state->current_token = new WP_HTML_Token(
             $this->bookmark_tag(),
             $this->get_tag(),
@@ -539 +530 @@
 
                 $this->reconstruct_active_formatting_elements();
-                $this->insert_html_element( $this->current_token );
+                $this->insert_html_element( $this->state->current_token );
                 $this->state->frameset_ok = false;
 
@@ -559 +550 @@
                 }
 
-                $this->insert_html_element( $this->current_token );
+                $this->insert_html_element( $this->state->current_token );
                 return true;
 
@@ -591 +582 @@
             case '-P':
                 if ( ! $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
-                    $this->insert_html_element( $this->current_token );
+                    $this->insert_html_element( $this->state->current_token );
                 }
 
@@ -613 +604 @@
 
                 $this->reconstruct_active_formatting_elements();
-                $this->insert_html_element( $this->current_token );
-                $this->state->active_formatting_elements->push( $this->current_token );
+                $this->insert_html_element( $this->state->current_token );
+                $this->state->active_formatting_elements->push( $this->state->current_token );
                 return true;
 
@@ -634 +625 @@
             case '+U':
                 $this->reconstruct_active_formatting_elements();
-                $this->insert_html_element( $this->current_token );
-                $this->state->active_formatting_elements->push( $this->current_token );
+                $this->insert_html_element( $this->state->current_token );
+                $this->state->active_formatting_elements->push( $this->state->current_token );
                 return true;
 
@@ -663 +654 @@
             case '+IMG':
                 $this->reconstruct_active_formatting_elements();
-                $this->insert_html_element( $this->current_token );
+                $this->insert_html_element( $this->state->current_token );
                 return true;
 
@@ -671 +662 @@
             case '+SPAN':
                 $this->reconstruct_active_formatting_elements();
-                $this->insert_html_element( $this->current_token );
+                $this->insert_html_element( $this->state->current_token );
                 return true;
 
@@ -797 +788 @@
     public function seek( $bookmark_name ) {
         $actual_bookmark_name = "_{$bookmark_name}";
-        $processor_started_at = $this->current_token ? $this->bookmarks[ $this->current_token->bookmark_name ]->start : 0;
+        $processor_started_at = $this->state->current_token
+            ? $this->bookmarks[ $this->state->current_token->bookmark_name ]->start
+            : 0;
         $bookmark_starts_at   = $this->bookmarks[ $actual_bookmark_name ]->start;
         $direction            = $bookmark_starts_at > $processor_started_at ? 'forward' : 'backward';
@@ -805 +798 @@
                 // When moving forwards, re-parse the document until reaching the same location as the original bookmark.
                 while ( $this->step() ) {
-                    if ( $bookmark_starts_at === $this->bookmarks[ $this->current_token->bookmark_name ]->start ) {
+                    if ( $bookmark_starts_at === $this->bookmarks[ $this->state->current_token->bookmark_name ]->start ) {
                         return true;
                     }