<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[58898] trunk/src/wp-includes/html-api/class-wp-html-processor.php: HTML API: Make "reset insertion mode appropriately" algorithm private.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/58898">58898</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/58898","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dmsnell</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-08-14 21:17:22 +0000 (Wed, 14 Aug 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/changeset/28656">[28656]</a>.
Props jonsurrell.
See <a href="https://core.trac.wordpress.org/ticket/61549">#61549</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeshtmlapiclasswphtmlprocessorphp">trunk/src/wp-includes/html-api/class-wp-html-processor.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeshtmlapiclasswphtmlprocessorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/html-api/class-wp-html-processor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/html-api/class-wp-html-processor.php 2024-08-14 19:49:03 UTC (rev 58897)
+++ trunk/src/wp-includes/html-api/class-wp-html-processor.php 2024-08-14 21:17:22 UTC (rev 58898)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1501,7 +1501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->stack_of_open_elements->pop_until( 'TEMPLATE' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->active_formatting_elements->clear_up_to_last_marker();
</span><span class="cx" style="display: block; padding: 0 10px"> array_pop( $this->state->stack_of_template_insertion_modes );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_insertion_mode();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset_insertion_mode_appropriately();
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2955,7 +2955,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->stack_of_open_elements->pop_until( 'TABLE' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_insertion_mode();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset_insertion_mode_appropriately();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->step( self::REPROCESS_CURRENT_NODE );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2968,7 +2968,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->stack_of_open_elements->pop_until( 'TABLE' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_insertion_mode();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset_insertion_mode_appropriately();
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3729,7 +3729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->step();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->stack_of_open_elements->pop_until( 'SELECT' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_insertion_mode();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset_insertion_mode_appropriately();
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3745,7 +3745,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->step();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->stack_of_open_elements->pop_until( 'SELECT' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_insertion_mode();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset_insertion_mode_appropriately();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->step( self::REPROCESS_CURRENT_NODE );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3800,7 +3800,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case '+TH':
</span><span class="cx" style="display: block; padding: 0 10px"> // @todo Indicate a parse error once it's possible.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->stack_of_open_elements->pop_until( 'SELECT' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_insertion_mode();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset_insertion_mode_appropriately();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->step( self::REPROCESS_CURRENT_NODE );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3819,7 +3819,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->step();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->stack_of_open_elements->pop_until( 'SELECT' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_insertion_mode();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset_insertion_mode_appropriately();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->step( self::REPROCESS_CURRENT_NODE );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3954,7 +3954,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->stack_of_open_elements->pop_until( 'TEMPLATE' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->state->active_formatting_elements->clear_up_to_last_marker();
</span><span class="cx" style="display: block; padding: 0 10px"> array_pop( $this->state->stack_of_template_insertion_modes );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->reset_insertion_mode();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->reset_insertion_mode_appropriately();
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->step( self::REPROCESS_CURRENT_NODE );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5100,7 +5100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see https://html.spec.whatwg.org/multipage/parsing.html#reset-the-insertion-mode-appropriately
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function reset_insertion_mode(): void {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function reset_insertion_mode_appropriately(): void {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Set the first node.
</span><span class="cx" style="display: block; padding: 0 10px"> $first_node = null;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->state->stack_of_open_elements->walk_down() as $first_node ) {
</span></span></pre>
</div>
</div>
</body>
</html>