dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 892be94)
Balancer: Inline BalancerStack::length()
authorTim Starling <tstarling@wikimedia.org>
Tue, 5 Jul 2016 10:32:44 +0000 (20:32 +1000)
committerTim Starling <tstarling@wikimedia.org>
Tue, 12 Jul 2016 04:18:05 +0000 (14:18 +1000)
Provides 1% reduction in benchmark time

Change-Id: Ie8ff66a836cd137234828effcce9547e2cb3cd58

includes/tidy/Balancer.php patch | blob | history

diff --git a/includes/tidy/Balancer.php b/includes/tidy/Balancer.php
index 6f7afff..9e96b14 100644 (file)
--- a/includes/tidy/Balancer.php
+++ b/includes/tidy/Balancer.php
@@ -813,7 +813,7 @@ class BalanceStack implements IteratorAggregate {
                $endTagSet = $thorough ?
                        BalanceSets::$thoroughImpliedEndTagsSet :
                        BalanceSets::$impliedEndTagsSet;
-               while ( $this->length() > 0 ) {
+               while ( $this->currentNode ) {
                        if ( $butnot !== null && $this->currentNode->isHtmlNamed( $butnot ) ) {
                                break;
                        }
@@ -828,7 +828,7 @@ class BalanceStack implements IteratorAggregate {
         * Return the adjusted current node.
         */
        public function adjustedCurrentNode( $fragmentContext ) {
-               return ( $fragmentContext && $this->length() === 1 ) ?
+               return ( $fragmentContext && count( $this->elements ) === 1 ) ?
                        $fragmentContext : $this->currentNode;
        }
 
@@ -916,7 +916,8 @@ class BalanceStack implements IteratorAggregate {
         * @param int $idx
         */
        public function popTo( $idx ) {
-               while ( $this->length() > $idx ) {
+               $length = count( $this->elements );
+               for ( $length = count( $this->elements ); $length > $idx; $length-- ) {
                        $this->pop();
                }
        }
@@ -928,7 +929,7 @@ class BalanceStack implements IteratorAggregate {
         * @param BalanceElement|array|string $tag
         */
        public function popTag( $tag ) {
-               while ( $this->length() > 0 ) {
+               while ( $this->currentNode ) {
                        if ( $this->currentNode->isA( $tag ) ) {
                                $this->pop();
                                break;
@@ -944,7 +945,7 @@ class BalanceStack implements IteratorAggregate {
         */
        public function clearToContext( $set ) {
                // Note that we don't loop to 0. Never pop the <html> elt off.
-               while ( $this->length() > 1 ) {
+               for ( $length = count( $this->elements ); $length > 1; $length-- ) {
                        if ( $this->currentNode->isA( $set ) ) {
                                break;
                        }
Wiklou, le Wiki du Wiklou