Bug 256180 parser part - Insert elements as siblings instead of children at the Blink-defined magic depth for compatibility. r=smaug

MozReview-Commit-ID: K8fgv3rgklt

parser/html/javasrc/StateSnapshot.java

@@ -1,22 +1,22 @@
 /*
  * Copyright (c) 2009-2010 Mozilla Foundation
  *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
  *
- * The above copyright notice and this permission notice shall be included in 
+ * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
 
@@ -37,12 +37,10 @@ public class StateSnapshot<T> implements TreeBuilderState<T> {
 
     private final T headPointer;
 
-    private final T deepTreeSurrogateParent;
-
     private final int mode;
 
     private final int originalMode;
-    
+
     private final boolean framesetOk;
 
     private final boolean needToDropLF;
@@ -55,7 +53,6 @@ public class StateSnapshot<T> implements TreeBuilderState<T> {
      * @param templateModeStack
      * @param formPointer
      * @param headPointer
-     * @param deepTreeSurrogateParent
      * @param mode
      * @param originalMode
      * @param framesetOk
@@ -64,21 +61,20 @@ public class StateSnapshot<T> implements TreeBuilderState<T> {
      */
     StateSnapshot(StackNode<T>[] stack,
             StackNode<T>[] listOfActiveFormattingElements, int[] templateModeStack, T formPointer,
-            T headPointer, T deepTreeSurrogateParent, int mode, int originalMode,
+            T headPointer, int mode, int originalMode,
             boolean framesetOk, boolean needToDropLF, boolean quirks) {
         this.stack = stack;
         this.listOfActiveFormattingElements = listOfActiveFormattingElements;
         this.templateModeStack = templateModeStack;
         this.formPointer = formPointer;
         this.headPointer = headPointer;
-        this.deepTreeSurrogateParent = deepTreeSurrogateParent;
         this.mode = mode;
         this.originalMode = originalMode;
         this.framesetOk = framesetOk;
         this.needToDropLF = needToDropLF;
         this.quirks = quirks;
     }
-    
+
     /**
      * @see nu.validator.htmlparser.impl.TreeBuilderState#getStack()
      */
@@ -109,25 +105,16 @@ public class StateSnapshot<T> implements TreeBuilderState<T> {
 
     /**
      * Returns the headPointer.
-     * 
+     *
      * @return the headPointer
      */
     public T getHeadPointer() {
         return headPointer;
     }
 
-    /**
-     * Returns the deepTreeSurrogateParent.
-     * 
-     * @return the deepTreeSurrogateParent
-     */
-    public T getDeepTreeSurrogateParent() {
-        return deepTreeSurrogateParent;
-    }
-    
     /**
      * Returns the mode.
-     * 
+     *
      * @return the mode
      */
     public int getMode() {
@@ -136,7 +123,7 @@ public class StateSnapshot<T> implements TreeBuilderState<T> {
 
     /**
      * Returns the originalMode.
-     * 
+     *
      * @return the originalMode
      */
     public int getOriginalMode() {
@@ -145,7 +132,7 @@ public class StateSnapshot<T> implements TreeBuilderState<T> {
 
     /**
      * Returns the framesetOk.
-     * 
+     *
      * @return the framesetOk
      */
     public boolean isFramesetOk() {
@@ -154,7 +141,7 @@ public class StateSnapshot<T> implements TreeBuilderState<T> {
 
     /**
      * Returns the needToDropLF.
-     * 
+     *
      * @return the needToDropLF
      */
     public boolean isNeedToDropLF() {
@@ -163,13 +150,13 @@ public class StateSnapshot<T> implements TreeBuilderState<T> {
 
     /**
      * Returns the quirks.
-     * 
+     *
      * @return the quirks
      */
     public boolean isQuirks() {
         return quirks;
     }
-    
+
     /**
      * @see nu.validator.htmlparser.impl.TreeBuilderState#getListOfActiveFormattingElementsLength()
      */