Mozilla bug 1636607 - Use prefix match for public identifiers that trigger the Almost Standards Mode. r=alchen

hsivonen · hsivonen · commit ad4c5cdc0e18 · 2020-06-12T11:28:34.000+03:00
Implements a part of the spec change https://searchfox.org/whatwg-html/diff/9345b201261c452868a68780ece85370f17644a3/source#42357 that was originally missed. Differential Revision: https://phabricator.services.mozilla.com/D74658
diff --git a/src/nu/validator/htmlparser/impl/TreeBuilder.java b/src/nu/validator/htmlparser/impl/TreeBuilder.java
@@ -4316,21 +4316,21 @@ private void documentModeInternal(DocumentMode m, String publicIdentifier,
 
     private boolean isAlmostStandards(String publicIdentifier,
             String systemIdentifier) {
-        if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(
-                "-//w3c//dtd xhtml 1.0 transitional//en", publicIdentifier)) {
+        if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(
+                "-//w3c//dtd xhtml 1.0 transitional//", publicIdentifier)) {
             return true;
         }
-        if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(
-                "-//w3c//dtd xhtml 1.0 frameset//en", publicIdentifier)) {
+        if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(
+                "-//w3c//dtd xhtml 1.0 frameset//", publicIdentifier)) {
             return true;
         }
         if (systemIdentifier != null) {
-            if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(
-                    "-//w3c//dtd html 4.01 transitional//en", publicIdentifier)) {
+            if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(
+                    "-//w3c//dtd html 4.01 transitional//", publicIdentifier)) {
                 return true;
             }
-            if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(
-                    "-//w3c//dtd html 4.01 frameset//en", publicIdentifier)) {
+            if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(
+                    "-//w3c//dtd html 4.01 frameset//", publicIdentifier)) {
                 return true;
             }
         }
@@ -4363,11 +4363,11 @@ private boolean isQuirky(@Local String name, String publicIdentifier,
             }
         }
         if (systemIdentifier == null) {
-            if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(
-                    "-//w3c//dtd html 4.01 transitional//en", publicIdentifier)) {
+            if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(
+                    "-//w3c//dtd html 4.01 transitional//", publicIdentifier)) {
                 return true;
-            } else if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(
-                    "-//w3c//dtd html 4.01 frameset//en", publicIdentifier)) {
+            } else if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(
+                    "-//w3c//dtd html 4.01 frameset//", publicIdentifier)) {
                 return true;
             }
         } else if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(

Original file line number	Diff line number	Diff line change
`@@ -4316,21 +4316,21 @@ private void documentModeInternal(DocumentMode m, String publicIdentifier,`
`4316`	`4316`
`4317`	`4317`	`private boolean isAlmostStandards(String publicIdentifier,`
`4318`	`4318`	`String systemIdentifier) {`
`4319`		`- if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(`
`4320`		`- "-//w3c//dtd xhtml 1.0 transitional//en", publicIdentifier)) {`
	`4319`	`+ if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(`
	`4320`	`+ "-//w3c//dtd xhtml 1.0 transitional//", publicIdentifier)) {`
`4321`	`4321`	`return true;`
`4322`	`4322`	`}`
`4323`		`- if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(`
`4324`		`- "-//w3c//dtd xhtml 1.0 frameset//en", publicIdentifier)) {`
	`4323`	`+ if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(`
	`4324`	`+ "-//w3c//dtd xhtml 1.0 frameset//", publicIdentifier)) {`
`4325`	`4325`	`return true;`
`4326`	`4326`	`}`
`4327`	`4327`	`if (systemIdentifier != null) {`
`4328`		`- if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(`
`4329`		`- "-//w3c//dtd html 4.01 transitional//en", publicIdentifier)) {`
	`4328`	`+ if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(`
	`4329`	`+ "-//w3c//dtd html 4.01 transitional//", publicIdentifier)) {`
`4330`	`4330`	`return true;`
`4331`	`4331`	`}`
`4332`		`- if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(`
`4333`		`- "-//w3c//dtd html 4.01 frameset//en", publicIdentifier)) {`
	`4332`	`+ if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(`
	`4333`	`+ "-//w3c//dtd html 4.01 frameset//", publicIdentifier)) {`
`4334`	`4334`	`return true;`
`4335`	`4335`	`}`
`4336`	`4336`	`}`
`@@ -4363,11 +4363,11 @@ private boolean isQuirky(@Local String name, String publicIdentifier,`
`4363`	`4363`	`}`
`4364`	`4364`	`}`
`4365`	`4365`	`if (systemIdentifier == null) {`
`4366`		`- if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(`
`4367`		`- "-//w3c//dtd html 4.01 transitional//en", publicIdentifier)) {`
	`4366`	`+ if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(`
	`4367`	`+ "-//w3c//dtd html 4.01 transitional//", publicIdentifier)) {`
`4368`	`4368`	`return true;`
`4369`		`- } else if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(`
`4370`		`- "-//w3c//dtd html 4.01 frameset//en", publicIdentifier)) {`
	`4369`	`+ } else if (Portability.lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(`
	`4370`	`+ "-//w3c//dtd html 4.01 frameset//", publicIdentifier)) {`
`4371`	`4371`	`return true;`
`4372`	`4372`	`}`
`4373`	`4373`	`} else if (Portability.lowerCaseLiteralEqualsIgnoreAsciiCaseString(`