Mozilla bug 1506133 - Remove Portability.newLocalFromLocal, and interner argument from cloneAttributes. r=hsivonen.

Author: emilio

src/nu/validator/htmlparser/impl/HtmlAttributes.java

@@ -435,8 +435,7 @@ public void adjustForSvg() {
         mode = AttributeName.SVG;
     }
 
-    public HtmlAttributes cloneAttributes(Interner interner)
-            throws SAXException {
+    public HtmlAttributes cloneAttributes() throws SAXException {
         assert (length == 0
                 && xmlnsLength == 0
                 )

src/nu/validator/htmlparser/impl/Portability.java

@@ -66,10 +66,6 @@ public static char[] newCharArrayFromString(String string) {
         return string.toCharArray();
     }
 
-    public static @Local String newLocalFromLocal(@Local String local, Interner interner) {
-        return local;
-    }
-
     // Deallocation methods
 
     public static void releaseString(String str) {

src/nu/validator/htmlparser/impl/Tokenizer.java

@@ -6859,13 +6859,7 @@ public void loadState(Tokenizer other) throws SAXException {
         seenDigits = other.seenDigits;
         endTag = other.endTag;
         shouldSuspend = false;
-
-        if (other.doctypeName == null) {
-            doctypeName = null;
-        } else {
-            doctypeName = Portability.newLocalFromLocal(other.doctypeName,
-                    interner);
-        }
+        doctypeName = other.doctypeName;
 
         Portability.releaseString(systemIdentifier);
         if (other.systemIdentifier == null) {
@@ -6890,7 +6884,7 @@ public void loadState(Tokenizer other) throws SAXException {
             // In the C++ case, the atoms in the other tokenizer are from a
             // different tokenizer-scoped atom table. Therefore, we have to
             // obtain the correspoding atom from our own atom table.
-            nonInternedTagName.setNameForNonInterned(Portability.newLocalFromLocal(other.tagName.getName(), interner)
+            nonInternedTagName.setNameForNonInterned(other.tagName.getName()
                     // CPPONLY: , other.tagName.isCustom()
                     );
             tagName = nonInternedTagName;
@@ -6907,15 +6901,15 @@ public void loadState(Tokenizer other) throws SAXException {
         // CPPONLY:     // In the C++ case, the atoms in the other tokenizer are from a
         // CPPONLY:     // different tokenizer-scoped atom table. Therefore, we have to
         // CPPONLY:     // obtain the correspoding atom from our own atom table.
-        // CPPONLY:     nonInternedAttributeName.setNameForNonInterned(Portability.newLocalFromLocal(other.attributeName.getLocal(AttributeName.HTML), interner));
+        // CPPONLY:     nonInternedAttributeName.setNameForNonInterned(other.attributeName.getLocal(AttributeName.HTML));
         // CPPONLY:     attributeName = nonInternedAttributeName;
         // CPPONLY: }
 
         Portability.delete(attributes);
         if (other.attributes == null) {
             attributes = null;
         } else {
-            attributes = other.attributes.cloneAttributes(interner);
+            attributes = other.attributes.cloneAttributes();
         }
     }
 
@@ -7151,8 +7145,9 @@ public void setEncodingDeclarationHandler(
 
     void destructor() {
         Portability.delete(nonInternedTagName);
-        // CPPONLY: Portability.delete(nonInternedAttributeName);
         nonInternedTagName = null;
+        // CPPONLY: Portability.delete(nonInternedAttributeName);
+        // CPPONLY: nonInternedAttributeName = null;
         // The translator will write refcount tracing stuff here
         Portability.delete(attributes);
         attributes = null;

src/nu/validator/htmlparser/impl/TreeBuilder.java

@@ -4786,7 +4786,7 @@ private boolean adoptionAgencyEndTag(@Local String name) throws SAXException {
                 assert node == listOfActiveFormattingElements[nodeListPos];
                 assert node == stack[nodePos];
                 T clone = createElement("http://www.w3.org/1999/xhtml",
-                        node.name, node.attributes.cloneAttributes(null), commonAncestor.node
+                        node.name, node.attributes.cloneAttributes(), commonAncestor.node
                         // CPPONLY: , htmlCreator(node.getHtmlCreator())
                         );
                 StackNode<T> newNode = createStackNode(node.getFlags(), node.ns,
@@ -4818,7 +4818,7 @@ private boolean adoptionAgencyEndTag(@Local String name) throws SAXException {
             }
             T clone = createElement("http://www.w3.org/1999/xhtml",
                     formattingElt.name,
-                    formattingElt.attributes.cloneAttributes(null), furthestBlock.node
+                    formattingElt.attributes.cloneAttributes(), furthestBlock.node
                     // CPPONLY: , htmlCreator(formattingElt.getHtmlCreator())
                     );
             StackNode<T> formattingClone = createStackNode(
@@ -5005,12 +5005,12 @@ private void reconstructTheActiveFormattingElements() throws SAXException {
             T clone;
             if (currentNode.isFosterParenting()) {
                 clone = createAndInsertFosterParentedElement("http://www.w3.org/1999/xhtml", entry.name,
-                        entry.attributes.cloneAttributes(null)
+                        entry.attributes.cloneAttributes()
                         // CPPONLY: , htmlCreator(entry.getHtmlCreator())
                         );
             } else {
                 clone = createElement("http://www.w3.org/1999/xhtml", entry.name,
-                        entry.attributes.cloneAttributes(null), currentNode.node
+                        entry.attributes.cloneAttributes(), currentNode.node
                         // CPPONLY: , htmlCreator(entry.getHtmlCreator())
                         );
                 appendElement(clone, currentNode.node);
@@ -5424,7 +5424,7 @@ private void appendToCurrentNodeAndPushFormattingElementMayFoster(
         checkAttributes(attributes, "http://www.w3.org/1999/xhtml");
         // ]NOCPP]
         // This method can't be called for custom elements
-        HtmlAttributes clone = attributes.cloneAttributes(null);
+        HtmlAttributes clone = attributes.cloneAttributes();
         // Attributes must not be read after calling createElement, because
         // createElement may delete attributes in C++.
         T elt;
@@ -6130,7 +6130,7 @@ private boolean charBufferContainsNonWhitespace() {
                 StackNode<T> newNode = new StackNode<T>(-1);
                 newNode.setValues(node.getFlags(), node.ns,
                         node.name, node.node, node.popName,
-                        node.attributes.cloneAttributes(null)
+                        node.attributes.cloneAttributes()
                         // CPPONLY: , node.getHtmlCreator()
                         // [NOCPP[
                         , node.getLocator()
@@ -6217,7 +6217,7 @@ public boolean snapshotMatches(TreeBuilderState<T> snapshot) {
     }
 
     @SuppressWarnings("unchecked") public void loadState(
-            TreeBuilderState<T> snapshot, Interner interner)
+            TreeBuilderState<T> snapshot)
             throws SAXException {
         // CPPONLY: mCurrentHtmlScriptIsAsyncOrDefer = false;
         StackNode<T>[] stackCopy = snapshot.getStack();
@@ -6254,9 +6254,9 @@ public boolean snapshotMatches(TreeBuilderState<T> snapshot) {
             StackNode<T> node = listCopy[i];
             if (node != null) {
                 StackNode<T> newNode = createStackNode(node.getFlags(), node.ns,
-                        Portability.newLocalFromLocal(node.name, interner), node.node,
-                        Portability.newLocalFromLocal(node.popName, interner),
-                        node.attributes.cloneAttributes(null)
+                        node.name, node.node,
+                        node.popName,
+                        node.attributes.cloneAttributes()
                         // CPPONLY: , node.getHtmlCreator()
                         // [NOCPP[
                         , node.getLocator()
@@ -6272,8 +6272,8 @@ public boolean snapshotMatches(TreeBuilderState<T> snapshot) {
             int listIndex = findInArray(node, listCopy);
             if (listIndex == -1) {
                 StackNode<T> newNode = createStackNode(node.getFlags(), node.ns,
-                        Portability.newLocalFromLocal(node.name, interner), node.node,
-                        Portability.newLocalFromLocal(node.popName, interner),
+                        node.name, node.node,
+                        node.popName,
                         null
                         // CPPONLY: , node.getHtmlCreator()
                         // [NOCPP[