Changeset 58898

Timestamp:

08/14/2024 09:17:22 PM (2 years ago)

Author:

dmsnell

Message:

HTML API: Make "reset insertion mode appropriately" algorithm private.

The algorithm is described and referred to in the specification as
"reset the insertion mode appropriately." This patch renames it to
more accurately reflect the specification, and it turns the public
method private. As an internal algorithm from the HTML specification
it should not be open to extension.

Developed in ​https://github.com/wordpress/wordpress-develop/pull/7194
Discussed in https://core.trac.wordpress.org/ticket/61549

Follow-up to [28656].
Props jonsurrell.
See #61549.

File:

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

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

@@ -1502 +1502 @@
                                 $this->state->active_formatting_elements->clear_up_to_last_marker();
                                 array_pop( $this->state->stack_of_template_insertion_modes );
-                                $this->reset_insertion_mode();
+                                $this->reset_insertion_mode_appropriately();
                                 return true;
                 }
@@ -2956 +2956 @@
 
                                 $this->state->stack_of_open_elements->pop_until( 'TABLE' );
-                                $this->reset_insertion_mode();
+                                $this->reset_insertion_mode_appropriately();
                                 return $this->step( self::REPROCESS_CURRENT_NODE );
 
@@ -2969 +2969 @@
 
                                 $this->state->stack_of_open_elements->pop_until( 'TABLE' );
-                                $this->reset_insertion_mode();
+                                $this->reset_insertion_mode_appropriately();
                                 return true;
 
@@ -3730 +3730 @@
                                 }
                                 $this->state->stack_of_open_elements->pop_until( 'SELECT' );
-                                $this->reset_insertion_mode();
+                                $this->reset_insertion_mode_appropriately();
                                 return true;
 
@@ -3746 +3746 @@
                                 }
                                 $this->state->stack_of_open_elements->pop_until( 'SELECT' );
-                                $this->reset_insertion_mode();
+                                $this->reset_insertion_mode_appropriately();
                                 return $this->step( self::REPROCESS_CURRENT_NODE );
 
@@ -3801 +3801 @@
                                 // @todo Indicate a parse error once it's possible.
                                 $this->state->stack_of_open_elements->pop_until( 'SELECT' );
-                                $this->reset_insertion_mode();
+                                $this->reset_insertion_mode_appropriately();
                                 return $this->step( self::REPROCESS_CURRENT_NODE );
 
@@ -3820 +3820 @@
                                 }
                                 $this->state->stack_of_open_elements->pop_until( 'SELECT' );
-                                $this->reset_insertion_mode();
+                                $this->reset_insertion_mode_appropriately();
                                 return $this->step( self::REPROCESS_CURRENT_NODE );
                 }
@@ -3955 +3955 @@
                 $this->state->active_formatting_elements->clear_up_to_last_marker();
                 array_pop( $this->state->stack_of_template_insertion_modes );
-                $this->reset_insertion_mode();
+                $this->reset_insertion_mode_appropriately();
                 return $this->step( self::REPROCESS_CURRENT_NODE );
         }
@@ -5101 +5101 @@
          * @see https://html.spec.whatwg.org/multipage/parsing.html#reset-the-insertion-mode-appropriately
          */
-        public function reset_insertion_mode(): void {
+        private function reset_insertion_mode_appropriately(): void {
                 // Set the first node.
                 $first_node = null;