Merge pull request #1518 from MoonchildProductions/shadowdom-merge

Incremental shadowdom-merge

5 files changed, 109 insertions, 115 deletions

diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java
index 4e1acea50..4b87d3fde 100644
--- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java
+++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/ElementName.java
@@ -1987,10 +1987,6 @@ public final class ElementName
     // CPPONLY: NS_NewHTMLUnknownElement,
     // CPPONLY: NS_NewSVGUnknownElement, 
     TreeBuilder.OTHER);
-    public static final ElementName CONTENT = new ElementName("content", "content", 
-    // CPPONLY: NS_NewHTMLContentElement,
-    // CPPONLY: NS_NewSVGUnknownElement, 
-    TreeBuilder.OTHER);
     public static final ElementName GT = new ElementName("gt", "gt", 
     // CPPONLY: NS_NewHTMLUnknownElement,
     // CPPONLY: NS_NewSVGUnknownElement, 
@@ -2175,6 +2171,10 @@ public final class ElementName
     // CPPONLY: NS_NewHTMLUnknownElement,
     // CPPONLY: NS_NewSVGUnknownElement, 
     TreeBuilder.OTHER);
+    public static final ElementName SLOT = new ElementName("slot", "slot", 
+    // CPPONLY: NS_NewHTMLSlotElement,
+    // CPPONLY: NS_NewSVGUnknownElement, 
+    TreeBuilder.OTHER);
     public static final ElementName SCRIPT = new ElementName("script", "script", 
     // CPPONLY: NS_NewHTMLScriptElement,
     // CPPONLY: NS_NewSVGScriptElement, 
@@ -2215,10 +2215,6 @@ public final class ElementName
     // CPPONLY: NS_NewHTMLUnknownElement,
     // CPPONLY: NS_NewSVGUnknownElement, 
     TreeBuilder.OTHER);
-    public static final ElementName SHADOW = new ElementName("shadow", "shadow", 
-    // CPPONLY: NS_NewHTMLShadowElement,
-    // CPPONLY: NS_NewSVGUnknownElement, 
-    TreeBuilder.OTHER);
     public static final ElementName VIEW = new ElementName("view", "view", 
     // CPPONLY: NS_NewHTMLUnknownElement,
     // CPPONLY: NS_NewSVGViewElement, 
@@ -2277,16 +2273,16 @@ public final class ElementName
     FIELDSET,
     DATA,
     LI,
-    COMPLEXES,
+    CANVAS,
     QUOTIENT,
     PRE,
     ARTICLE,
     DIALOG,
     ARCTAN,
     LISTENER,
-    RATIONALS,
+    REALS,
     MROOT,
-    MATRIXROW,
+    MROW,
     GEQ,
     G,
     DD,
@@ -2296,12 +2292,12 @@ public final class ElementName
     INTERVAL,
     MN,
     BR,
-    POWER,
-    MMULTISCRIPTS,
-    CONTENT,
+    NOTANUMBER,
+    MPRESCRIPTS,
+    CARTESIANPRODUCT,
     INTERSECT,
     RT,
-    TFOOT,
+    SCRIPT,
     APPLY,
     COS,
     MTD,
@@ -2321,18 +2317,18 @@ public final class ElementName
     OPTION,
     MALIGNGROUP,
     FECOMPONENTTRANSFER,
-    MERROR,
-    VECTOR,
-    IMPLIES,
-    PRIMES,
-    APPLET,
+    MUNDEROVER,
+    SELECTOR,
+    EXISTS,
+    NATURALNUMBERS,
+    DT,
     EMPTYSET,
     FEPOINTLIGHT,
     LOWLIMIT,
     NOTSUBSET,
     PRODUCT,
     SELECT,
-    MENU,
+    VECTORPRODUCT,
     FECOLORMATRIX,
     INFINITY,
     BIG,
@@ -2371,16 +2367,16 @@ public final class ElementName
     OPTGROUP,
     CENTER,
     FEGAUSSIANBLUR,
-    MOVER,
-    NOBR,
-    SOLIDCOLOR,
-    ADDRESS,
-    DETAILS,
-    MS,
-    NOFRAMES,
-    PLUS,
-    TIMES,
-    BASEFONT,
+    METER,
+    MLABELEDTR,
+    TR,
+    ARCCOS,
+    DEFS,
+    INTEGERS,
+    MINUS,
+    PROGRESS,
+    SEMANTICS,
+    ARCCOT,
     DETERMINANT,
     FONT_FACE_FORMAT,
     FEOFFSET,
@@ -2393,8 +2389,8 @@ public final class ElementName
     PLAINTEXT,
     RADIALGRADIENT,
     SUBSET,
-    UPLIMIT,
-    FEDROPSHADOW,
+    TEXT,
+    SDEV,
     VIEW,
     ISINDEX,
     FEMORPHOLOGY,
@@ -2472,25 +2468,25 @@ public final class ElementName
     FOOTER,
     HANDLER,
     MARKER,
-    MUNDEROVER,
-    MLABELEDTR,
-    NOTANUMBER,
-    TR,
-    SELECTOR,
-    ARCCOS,
-    CANVAS,
-    DEFS,
-    EXISTS,
-    INTEGERS,
-    MPRESCRIPTS,
-    MINUS,
-    NATURALNUMBERS,
-    PROGRESS,
-    REALS,
-    SEMANTICS,
-    DT,
-    ARCCOT,
-    CARTESIANPRODUCT,
+    MOVER,
+    MERROR,
+    NOBR,
+    POWER,
+    SOLIDCOLOR,
+    VECTOR,
+    ADDRESS,
+    COMPLEXES,
+    DETAILS,
+    IMPLIES,
+    MS,
+    MMULTISCRIPTS,
+    NOFRAMES,
+    PRIMES,
+    PLUS,
+    RATIONALS,
+    TIMES,
+    APPLET,
+    BASEFONT,
     GT,
     DATALIST,
     EQUIVALENT,
@@ -2514,12 +2510,12 @@ public final class ElementName
     RECT,
     ROOT,
     SCALARPRODUCT,
-    SCRIPT,
-    TEXT,
-    VECTORPRODUCT,
-    SDEV,
-    MROW,
-    SHADOW,
+    SLOT,
+    TFOOT,
+    UPLIMIT,
+    MENU,
+    FEDROPSHADOW,
+    MATRIXROW,
     APPROX,
     FECONVOLVEMATRIX,
     MATRIX,
@@ -2672,7 +2668,6 @@ public final class ElementName
     HEADER,
     OR,
     MUNDER,
-    METER,
     };
     private final static int[] ELEMENT_HASHES = {
     1909280949,
@@ -2680,16 +2675,16 @@ public final class ElementName
     2001349704,
     1681770564,
     1818230786,
-    1983002201,
+    1982935782,
     2007257240,
     58773795,
     1747176599,
     1782357526,
     1897999926,
     1970938456,
-    1990969577,
+    1990969429,
     2005181733,
-    2055515017,
+    2055514836,
     54061139,
     62390273,
     1730150402,
@@ -2699,12 +2694,12 @@ public final class ElementName
     1868641064,
     1902641154,
     1963982850,
-    1973040373,
-    1988486813,
-    1999917383,
+    1971981018,
+    1988486811,
+    1999745104,
     2002882873,
     2005925890,
-    2008851557,
+    2008340774,
     2082727685,
     51965171,
     57200451,
@@ -2724,18 +2719,18 @@ public final class ElementName
     1905563974,
     1938171179,
     1967788867,
-    1971628838,
-    1976348214,
-    1986140359,
-    1989812374,
-    1998724870,
+    1971467002,
+    1974775352,
+    1984294038,
+    1988972590,
+    1998585858,
     2000825752,
     2001392796,
     2004557976,
     2005543977,
     2006560839,
     2008125638,
-    2021937364,
+    2009706573,
     2068523853,
     2087049448,
     51434643,
@@ -2774,16 +2769,16 @@ public final class ElementName
     1939219752,
     1966223078,
     1968053806,
-    1971466997,
-    1971938532,
-    1974771450,
-    1982173479,
-    1983633431,
-    1986527234,
-    1988763672,
-    1990074116,
-    1991909525,
-    1999397992,
+    1971465813,
+    1971703386,
+    1973420034,
+    1982106678,
+    1983533124,
+    1986351224,
+    1988502165,
+    1990037800,
+    1991350601,
+    1998883894,
     2000439531,
     2001281328,
     2001349736,
@@ -2796,8 +2791,8 @@ public final class ElementName
     2006896969,
     2007781534,
     2008165414,
-    2009276567,
-    2051837468,
+    2008994116,
+    2041712436,
     2060065124,
     2070023911,
     2085266636,
@@ -2875,25 +2870,25 @@ public final class ElementName
     1967795958,
     1968840263,
     1971461414,
-    1971467002,
-    1971703386,
-    1971981018,
-    1973420034,
-    1974775352,
-    1982106678,
-    1982935782,
-    1983533124,
-    1984294038,
-    1986351224,
-    1988486811,
-    1988502165,
-    1988972590,
-    1990037800,
-    1990969429,
-    1991350601,
-    1998585858,
-    1998883894,
-    1999745104,
+    1971466997,
+    1971628838,
+    1971938532,
+    1973040373,
+    1974771450,
+    1976348214,
+    1982173479,
+    1983002201,
+    1983633431,
+    1986140359,
+    1986527234,
+    1988486813,
+    1988763672,
+    1989812374,
+    1990074116,
+    1990969577,
+    1991909525,
+    1998724870,
+    1999397992,
     2000158722,
     2000525512,
     2000965834,
@@ -2917,12 +2912,12 @@ public final class ElementName
     2007601444,
     2007803172,
     2008133709,
-    2008340774,
-    2008994116,
-    2009706573,
-    2041712436,
-    2055514836,
-    2058653206,
+    2008325940,
+    2008851557,
+    2009276567,
+    2021937364,
+    2051837468,
+    2055515017,
     2066000646,
     2068523856,
     2072193862,
@@ -3075,6 +3070,5 @@ public final class ElementName
     1968836118,
     1970798594,
     1971457766,
-    1971465813,
     };
 }
diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/MetaScanner.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/MetaScanner.java
index 9a3dc16b2..be7576ff0 100644
--- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/MetaScanner.java
+++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/MetaScanner.java
@@ -798,13 +798,13 @@ public abstract class MetaScanner {
         }
         if (contentIndex == CONTENT.length && content == null) {
             content = Portability.newStringFromBuffer(strBuf, 0, strBufLen
-                 // CPPONLY: , treeBuilder
+                 // CPPONLY: , treeBuilder, false
             );
             return;
         }
         if (charsetIndex == CHARSET.length && charset == null) {
             charset = Portability.newStringFromBuffer(strBuf, 0, strBufLen
-                 // CPPONLY: , treeBuilder
+                 // CPPONLY: , treeBuilder, false
             );
             return;
         }
diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Portability.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Portability.java
index 2b3f96625..8f941ce01 100644
--- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Portability.java
+++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Portability.java
@@ -42,7 +42,7 @@ public final class Portability {
     }
 
     public static String newStringFromBuffer(@NoLength char[] buf, int offset, int length
-        // CPPONLY: , TreeBuilder treeBuilder
+        // CPPONLY: , TreeBuilder treeBuilder, boolean maybeAtomize
     ) {
         return new String(buf, offset, length);
     }
diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Tokenizer.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Tokenizer.java
index 996bd9ceb..3d617fd01 100644
--- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Tokenizer.java
+++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/Tokenizer.java
@@ -917,7 +917,7 @@ public class Tokenizer implements Locator {
      */
     protected String strBufToString() {
         String str = Portability.newStringFromBuffer(strBuf, 0, strBufLen
-            // CPPONLY: , tokenHandler
+            // CPPONLY: , tokenHandler, !newAttributesEachTime && attributeName == AttributeName.CLASS
         );
         clearStrBufAfterUse();
         return str;
diff --git a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java
index cc60f4c4b..ef9576ee3 100644
--- a/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java
+++ b/parser/html/java/htmlparser/src/nu/validator/htmlparser/impl/TreeBuilder.java
@@ -3337,7 +3337,7 @@ public abstract class TreeBuilder<T> implements TokenHandler,
             }
             charset = Portability.newStringFromBuffer(buffer, start, end
                     - start
-                // CPPONLY: , tb
+                // CPPONLY: , tb, false
             );
         }
         return charset;