From 9c9329c44791336e247fec4d7c2dca31f505180f Mon Sep 17 00:00:00 2001 From: Bernie Reiter Date: Tue, 12 Sep 2023 15:10:19 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@56558 602fd350-edb4-49c9-b593-d223f7449a82 --- .../class-wp-html-processor-state.php | 9 +++++ .../html-api/class-wp-html-processor.php | 35 ++++++++----------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/wp-includes/html-api/class-wp-html-processor-state.php b/src/wp-includes/html-api/class-wp-html-processor-state.php index 3fe5192431..9cf10c3441 100644 --- a/src/wp-includes/html-api/class-wp-html-processor-state.php +++ b/src/wp-includes/html-api/class-wp-html-processor-state.php @@ -85,6 +85,15 @@ class WP_HTML_Processor_State { */ public $active_formatting_elements = null; + /** + * Refers to the currently-matched tag, if any. + * + * @since 6.4.0 + * + * @var WP_HTML_Token|null + */ + public $current_token = null; + /** * Tree construction insertion mode. * diff --git a/src/wp-includes/html-api/class-wp-html-processor.php b/src/wp-includes/html-api/class-wp-html-processor.php index b5a20dbd82..64fd23924e 100644 --- a/src/wp-includes/html-api/class-wp-html-processor.php +++ b/src/wp-includes/html-api/class-wp-html-processor.php @@ -164,15 +164,6 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { */ 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; - /** * Stores an explanation for why something failed, if it did. * @@ -451,7 +442,7 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { return false; } - $this->current_token = new WP_HTML_Token( + $this->state->current_token = new WP_HTML_Token( $this->bookmark_tag(), $this->get_tag(), $this->is_tag_closer(), @@ -538,7 +529,7 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { } $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; return true; @@ -558,7 +549,7 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { $this->close_a_p_element(); } - $this->insert_html_element( $this->current_token ); + $this->insert_html_element( $this->state->current_token ); return true; /* @@ -590,7 +581,7 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { */ 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 ); } $this->close_a_p_element(); @@ -612,8 +603,8 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { } $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; /* @@ -633,8 +624,8 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { case '+TT': 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; /* @@ -662,7 +653,7 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { */ case '+IMG': $this->reconstruct_active_formatting_elements(); - $this->insert_html_element( $this->current_token ); + $this->insert_html_element( $this->state->current_token ); return true; /* @@ -670,7 +661,7 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { */ case '+SPAN': $this->reconstruct_active_formatting_elements(); - $this->insert_html_element( $this->current_token ); + $this->insert_html_element( $this->state->current_token ); return true; /* @@ -796,7 +787,9 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { */ 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'; @@ -804,7 +797,7 @@ class WP_HTML_Processor extends WP_HTML_Tag_Processor { case 'forward': // 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; } }