Title: [271043] trunk/LayoutTests
Revision
271043
Author
[email protected]
Date
2020-12-21 15:50:35 -0800 (Mon, 21 Dec 2020)

Log Message

Remove non-inclusive language from layout tests
https://bugs.webkit.org/show_bug.cgi?id=220063

Reviewed by Geoffrey Garen.

This patch removes many instances of non-inclusive language from the layout tests.

* fast/canvas/webgl/oes-element-index-uint.html:
* fast/canvas/webgl/oes-vertex-array-object.html:
* fast/encoding/idn-security.html:
* fast/images/image-formats-support-expected.txt:
* fast/images/image-formats-support.html:
* fast/text/arabic-blacklisted-expected.html: Removed.
* fast/text/arabic-blacklisted.html: Removed.
* fast/text/arabic-blocked-fonts-expected.html: Copied from fast/text/arabic-blacklisted-expected.html.
* fast/text/arabic-blocked-fonts.html: Copied from fast/text/arabic-blacklisted.html.
* http/tests/appcache/online-whitelist-expected.txt:
* http/tests/appcache/online-whitelist.html:
* http/tests/appcache/resources/allowlist-wildcard.manifest: Copied from http/tests/appcache/resources/whitelist-wildcard.manifest.
* http/tests/appcache/resources/online-allowlist.manifest: Copied from http/tests/appcache/resources/online-whitelist.manifest.
* http/tests/appcache/resources/online-allowlist.php: Copied from http/tests/appcache/resources/online-whitelist.php.
* http/tests/appcache/resources/online-whitelist.manifest: Removed.
* http/tests/appcache/resources/online-whitelist.php: Removed.
* http/tests/appcache/resources/whitelist-wildcard.manifest: Removed.
* http/tests/appcache/whitelist-wildcard-expected.txt:
* http/tests/appcache/whitelist-wildcard.html:
* http/tests/misc/char-encoding-bocu-1-blacklisted-expected.txt: Removed.
* http/tests/misc/char-encoding-bocu-1-blacklisted.html: Removed.
* http/tests/misc/char-encoding-bocu-1-blocklisted-expected.txt: Added.
* http/tests/misc/char-encoding-bocu-1-blocklisted.html: Copied from http/tests/misc/char-encoding-bocu-1-blacklisted.html.
* http/tests/misc/char-encoding-scsu-blacklisted-expected.txt: Removed.
* http/tests/misc/char-encoding-scsu-blacklisted.html: Removed.
* http/tests/misc/char-encoding-scsu-blocklisted-expected.txt: Added.
* http/tests/misc/char-encoding-scsu-blocklisted.html: Copied from http/tests/misc/char-encoding-scsu-blacklisted.html.
* http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed-expected.txt:
* http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed.html:
* http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt:
* http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01.html:
* http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt:
* http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02.html:
* http/tests/security/cross-frame-access-enumeration-expected.txt:
* http/tests/security/cross-frame-access-enumeration.html:
* http/tests/security/isolatedWorld/cross-origin-xhr-expected.txt:
* http/tests/security/isolatedWorld/cross-origin-xhr.html:
* http/tests/security/local-image-from-remote-allow-list-expected.txt:
* http/tests/security/local-image-from-remote-allow-list.html:
* http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers.html:
* http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple.html:
* http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached.html:
* http/tests/xmlhttprequest/origin-allow-list-all-expected.txt:
* http/tests/xmlhttprequest/origin-allow-list-all.html:
* http/tests/xmlhttprequest/origin-allow-list-exact-match-expected.txt:
* http/tests/xmlhttprequest/origin-allow-list-exact-match.html:
* http/tests/xmlhttprequest/origin-allow-list-https-expected.txt:
* http/tests/xmlhttprequest/origin-allow-list-https.html:
* http/tests/xmlhttprequest/origin-allow-list-ip-addresses-expected.txt:
* http/tests/xmlhttprequest/origin-allow-list-ip-addresses-with-subdomains.html:
* http/tests/xmlhttprequest/origin-allow-list-ip-addresses.html:
* http/tests/xmlhttprequest/origin-allow-list-removal-expected.txt:
* http/tests/xmlhttprequest/origin-allow-list-removal.html:
* http/tests/xmlhttprequest/origin-allow-list-subdomains-expected.txt:
* http/tests/xmlhttprequest/origin-allow-list-subdomains.html:
* http/tests/xmlhttprequest/resources/origin-allowlisting-ip-address-test.html: Copied from http/tests/xmlhttprequest/resources/origin-whitelisting-ip-address-test.html.
* http/tests/xmlhttprequest/resources/origin-whitelisting-ip-address-test.html: Removed.
* http/tests/xmlhttprequest/workers/resources/access-control-basic-get-fail-non-simple.js:
(start):
* inspector/timeline/line-column.html:
* js/promises-tests/resources/mocha.js:
* media/track/captions-webvtt/allowlist.vtt: Copied from media/track/captions-webvtt/whitelist.vtt.
* media/track/captions-webvtt/whitelist.vtt: Removed.
* media/track/track-css-property-allowlist-expected.txt: Added.
* media/track/track-css-property-allowlist.html: Copied from media/track/track-css-property-whitelist.html.
* media/track/track-css-property-whitelist-expected.txt: Removed.
* media/track/track-css-property-whitelist.html: Removed.
* platform/glib/TestExpectations:
* platform/mac/TestExpectations:
* platform/win/TestExpectations:
* platform/wincairo/TestExpectations:
* platform/wpe/security/block-test-expected.txt:
* security/block-test-expected.txt:
* security/block-test.html:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (271042 => 271043)


--- trunk/LayoutTests/ChangeLog	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/ChangeLog	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,3 +1,88 @@
+2020-12-21  Beth Dakin  <[email protected]>
+
+        Remove non-inclusive language from layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=220063
+
+        Reviewed by Geoffrey Garen.
+
+        This patch removes many instances of non-inclusive language from the layout tests.
+
+        * fast/canvas/webgl/oes-element-index-uint.html:
+        * fast/canvas/webgl/oes-vertex-array-object.html:
+        * fast/encoding/idn-security.html:
+        * fast/images/image-formats-support-expected.txt:
+        * fast/images/image-formats-support.html:
+        * fast/text/arabic-blacklisted-expected.html: Removed.
+        * fast/text/arabic-blacklisted.html: Removed.
+        * fast/text/arabic-blocked-fonts-expected.html: Copied from fast/text/arabic-blacklisted-expected.html.
+        * fast/text/arabic-blocked-fonts.html: Copied from fast/text/arabic-blacklisted.html.
+        * http/tests/appcache/online-whitelist-expected.txt:
+        * http/tests/appcache/online-whitelist.html:
+        * http/tests/appcache/resources/allowlist-wildcard.manifest: Copied from http/tests/appcache/resources/whitelist-wildcard.manifest.
+        * http/tests/appcache/resources/online-allowlist.manifest: Copied from http/tests/appcache/resources/online-whitelist.manifest.
+        * http/tests/appcache/resources/online-allowlist.php: Copied from http/tests/appcache/resources/online-whitelist.php.
+        * http/tests/appcache/resources/online-whitelist.manifest: Removed.
+        * http/tests/appcache/resources/online-whitelist.php: Removed.
+        * http/tests/appcache/resources/whitelist-wildcard.manifest: Removed.
+        * http/tests/appcache/whitelist-wildcard-expected.txt:
+        * http/tests/appcache/whitelist-wildcard.html:
+        * http/tests/misc/char-encoding-bocu-1-blacklisted-expected.txt: Removed.
+        * http/tests/misc/char-encoding-bocu-1-blacklisted.html: Removed.
+        * http/tests/misc/char-encoding-bocu-1-blocklisted-expected.txt: Added.
+        * http/tests/misc/char-encoding-bocu-1-blocklisted.html: Copied from http/tests/misc/char-encoding-bocu-1-blacklisted.html.
+        * http/tests/misc/char-encoding-scsu-blacklisted-expected.txt: Removed.
+        * http/tests/misc/char-encoding-scsu-blacklisted.html: Removed.
+        * http/tests/misc/char-encoding-scsu-blocklisted-expected.txt: Added.
+        * http/tests/misc/char-encoding-scsu-blocklisted.html: Copied from http/tests/misc/char-encoding-scsu-blacklisted.html.
+        * http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed-expected.txt:
+        * http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed.html:
+        * http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt:
+        * http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01.html:
+        * http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt:
+        * http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02.html:
+        * http/tests/security/cross-frame-access-enumeration-expected.txt:
+        * http/tests/security/cross-frame-access-enumeration.html:
+        * http/tests/security/isolatedWorld/cross-origin-xhr-expected.txt:
+        * http/tests/security/isolatedWorld/cross-origin-xhr.html:
+        * http/tests/security/local-image-from-remote-allow-list-expected.txt:
+        * http/tests/security/local-image-from-remote-allow-list.html:
+        * http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers-expected.txt:
+        * http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers.html:
+        * http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple.html:
+        * http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached.html:
+        * http/tests/xmlhttprequest/origin-allow-list-all-expected.txt:
+        * http/tests/xmlhttprequest/origin-allow-list-all.html:
+        * http/tests/xmlhttprequest/origin-allow-list-exact-match-expected.txt:
+        * http/tests/xmlhttprequest/origin-allow-list-exact-match.html:
+        * http/tests/xmlhttprequest/origin-allow-list-https-expected.txt:
+        * http/tests/xmlhttprequest/origin-allow-list-https.html:
+        * http/tests/xmlhttprequest/origin-allow-list-ip-addresses-expected.txt:
+        * http/tests/xmlhttprequest/origin-allow-list-ip-addresses-with-subdomains.html:
+        * http/tests/xmlhttprequest/origin-allow-list-ip-addresses.html:
+        * http/tests/xmlhttprequest/origin-allow-list-removal-expected.txt:
+        * http/tests/xmlhttprequest/origin-allow-list-removal.html:
+        * http/tests/xmlhttprequest/origin-allow-list-subdomains-expected.txt:
+        * http/tests/xmlhttprequest/origin-allow-list-subdomains.html:
+        * http/tests/xmlhttprequest/resources/origin-allowlisting-ip-address-test.html: Copied from http/tests/xmlhttprequest/resources/origin-whitelisting-ip-address-test.html.
+        * http/tests/xmlhttprequest/resources/origin-whitelisting-ip-address-test.html: Removed.
+        * http/tests/xmlhttprequest/workers/resources/access-control-basic-get-fail-non-simple.js:
+        (start):
+        * inspector/timeline/line-column.html:
+        * js/promises-tests/resources/mocha.js:
+        * media/track/captions-webvtt/allowlist.vtt: Copied from media/track/captions-webvtt/whitelist.vtt.
+        * media/track/captions-webvtt/whitelist.vtt: Removed.
+        * media/track/track-css-property-allowlist-expected.txt: Added.
+        * media/track/track-css-property-allowlist.html: Copied from media/track/track-css-property-whitelist.html.
+        * media/track/track-css-property-whitelist-expected.txt: Removed.
+        * media/track/track-css-property-whitelist.html: Removed.
+        * platform/glib/TestExpectations:
+        * platform/mac/TestExpectations:
+        * platform/win/TestExpectations:
+        * platform/wincairo/TestExpectations:
+        * platform/wpe/security/block-test-expected.txt:
+        * security/block-test-expected.txt:
+        * security/block-test.html:
+
 2020-12-21  Jessica Tallon  <[email protected]>
 
         [JSC] Fix expectation for WASM JS-type reflection WPTs

Modified: trunk/LayoutTests/fast/canvas/webgl/oes-element-index-uint.html (271042 => 271043)


--- trunk/LayoutTests/fast/canvas/webgl/oes-element-index-uint.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/fast/canvas/webgl/oes-element-index-uint.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -149,7 +149,7 @@
         gl.readPixels(x, y, 1, 1, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
         return pixels;
     };
-    function testPixel(blackList, whiteList) {
+    function testPixel(blockList, allowList) {
         function testList(list, expected) {
             for (var n = 0; n < list.length; n++) {
                 var l = list[n];
@@ -162,7 +162,7 @@
             }
             return true;
         }
-        return testList(blackList, 0) && testList(whiteList, 255);
+        return testList(blockList, 0) && testList(allowList, 255);
     };
     function verifyDraw(drawNumber, s) {
         gl.clearColor(1.0, 1.0, 1.0, 1.0);
@@ -169,17 +169,17 @@
         gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
         gl.drawElements(gl.TRIANGLES, 6, gl.UNSIGNED_INT, 0);
 
-        var blackList = [];
-        var whiteList = [];
+        var blockList = [];
+        var allowList = [];
         var points = [0.0, 0.2, 0.4, 0.6, 0.8, 1.0];
         for (var n = 0; n < points.length; n++) {
             if (points[n] <= s) {
-                blackList.push(points[n]);
+                blockList.push(points[n]);
             } else {
-                whiteList.push(points[n]);
+                allowList.push(points[n]);
             }
         }
-        if (testPixel(blackList, whiteList)) {
+        if (testPixel(blockList, allowList)) {
             testPassed("Draw " + drawNumber + " passed pixel test");
         } else {
             testFailed("Draw " + drawNumber + " failed pixel test");

Modified: trunk/LayoutTests/fast/canvas/webgl/oes-vertex-array-object.html (271042 => 271043)


--- trunk/LayoutTests/fast/canvas/webgl/oes-vertex-array-object.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/fast/canvas/webgl/oes-vertex-array-object.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -357,7 +357,7 @@
         gl.readPixels(x, y, 1, 1, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
         return pixels;
     };
-    function testPixel(blackList, whiteList) {
+    function testPixel(blockList, allowList) {
         function testList(list, expected) {
             for (var n = 0; n < list.length; n++) {
                 var l = list[n];
@@ -370,21 +370,21 @@
             }
             return true;
         }
-        return testList(blackList, 0) && testList(whiteList, 255);
+        return testList(blockList, 0) && testList(allowList, 255);
     };
     function verifyDraw(drawNumber, s) {
         wtu.drawQuad(gl);
-        var blackList = [];
-        var whiteList = [];
+        var blockList = [];
+        var allowList = [];
         var points = [0.0, 0.2, 0.4, 0.6, 0.8, 1.0];
         for (var n = 0; n < points.length; n++) {
             if (points[n] <= s) {
-                blackList.push(points[n]);
+                blockList.push(points[n]);
             } else {
-                whiteList.push(points[n]);
+                allowList.push(points[n]);
             }
         }
-        if (testPixel(blackList, whiteList)) {
+        if (testPixel(blockList, allowList)) {
             testPassed("Draw " + drawNumber + " passed pixel test");
         } else {
             testFailed("Draw " + drawNumber + " failed pixel test");

Modified: trunk/LayoutTests/fast/encoding/idn-security.html (271042 => 271043)


--- trunk/LayoutTests/fast/encoding/idn-security.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/fast/encoding/idn-security.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -115,7 +115,7 @@
 testIDNCharacter(".".charCodeAt(0), "allowed");
 testIDNCharacter("/".charCodeAt(0), "allowed");
 
-/* Allowed Characters - one character for each script in the default IDN whitelist*/
+/* Allowed Characters - one character for each script in the default IDN allowlist*/
 testIDNCharacter(0x0061, "allowed");
 testIDNCharacter(0x0633, "allowed");
 testIDNCharacter(0x0561, "allowed");
@@ -158,7 +158,7 @@
 testIDNCharacter(0x3000, "%20");
 
 /* Disallow these characters.  Some of these are known lookalike characters for dot and slash.  
-   A lot of these are from Mozilla's blacklist: http://kb.mozillazine.org/Network.IDN.blacklist_chars
+   A lot of these are from Mozilla's blocklist: http://kb.mozillazine.org/Network.IDN.blacklist_chars
 */
 testIDNCharacter(0x00BC, "disallowed");
 testIDNCharacter(0x00BD, "disallowed");

Modified: trunk/LayoutTests/fast/images/image-formats-support-expected.txt (271042 => 271043)


--- trunk/LayoutTests/fast/images/image-formats-support-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/fast/images/image-formats-support-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-Test the whitelist of the image formats in WebKit.
+Test the allowlist of the image formats in WebKit.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 

Modified: trunk/LayoutTests/fast/images/image-formats-support.html (271042 => 271043)


--- trunk/LayoutTests/fast/images/image-formats-support.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/fast/images/image-formats-support.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -17,7 +17,7 @@
         // The test finishes after getting the results of loading all the images.
         jsTestIsAsync = true;
 
-        description("Test the whitelist of the image formats in WebKit.");
+        description("Test the allowlist of the image formats in WebKit.");
 
         var images = [
             { id: "image-1", src: "resources/100x100-red.psd", isSupported: false },

Deleted: trunk/LayoutTests/fast/text/arabic-blacklisted-expected.html (271042 => 271043)


--- trunk/LayoutTests/fast/text/arabic-blacklisted-expected.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/fast/text/arabic-blacklisted-expected.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-This test makes sure that Arabic blacklisted fonts properly fall back to Geeza Pro. The test passes if you see an Arabic character below (not a square).
-<div style="font: 100px GeezaPro;">&#x0645;</div>
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/text/arabic-blacklisted.html (271042 => 271043)


--- trunk/LayoutTests/fast/text/arabic-blacklisted.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/fast/text/arabic-blacklisted.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-This test makes sure that Arabic blacklisted fonts properly fall back to Geeza Pro. The test passes if you see an Arabic character below (not a square).
-<div style="font: 100px Georgia;">&#x0645;</div>
-</body>
-</html>

Added: trunk/LayoutTests/fast/text/arabic-blocked-fonts-expected.html (0 => 271043)


--- trunk/LayoutTests/fast/text/arabic-blocked-fonts-expected.html	                        (rev 0)
+++ trunk/LayoutTests/fast/text/arabic-blocked-fonts-expected.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that Arabic blocked fonts properly fall back to Geeza Pro. The test passes if you see an Arabic character below (not a square).
+<div style="font: 100px GeezaPro;">&#x0645;</div>
+</body>
+</html>

Added: trunk/LayoutTests/fast/text/arabic-blocked-fonts.html (0 => 271043)


--- trunk/LayoutTests/fast/text/arabic-blocked-fonts.html	                        (rev 0)
+++ trunk/LayoutTests/fast/text/arabic-blocked-fonts.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that Arabic blocked fonts properly fall back to Geeza Pro. The test passes if you see an Arabic character below (not a square).
+<div style="font: 100px Georgia;">&#x0645;</div>
+</body>
+</html>

Modified: trunk/LayoutTests/http/tests/appcache/online-whitelist-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/appcache/online-whitelist-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/appcache/online-whitelist-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,5 +1,5 @@
 CONSOLE MESSAGE: ApplicationCache is deprecated. Please use ServiceWorkers instead.
-Test online whitelist functionality. Should say PASS:
+Test online allowlist functionality. Should say PASS:
 
 PASS
 

Modified: trunk/LayoutTests/http/tests/appcache/online-whitelist.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/appcache/online-whitelist.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/appcache/online-whitelist.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,6 +1,6 @@
-<html manifest="resources/online-whitelist.manifest">
+<html manifest="resources/online-allowlist.manifest">
 <body>
-<p>Test online whitelist functionality. Should say PASS:</p>
+<p>Test online allowlist functionality. Should say PASS:</p>
 
 <div id="result"></div>
 <script>
@@ -43,22 +43,22 @@
 
 function test()
 {
-    if (load("resources/online-whitelist.php?cached") != load("resources/online-whitelist.php?cached")) {
-        log("FAIL: Explicit entry didn't override online whitelist.");
+    if (load("resources/online-allowlist.php?cached") != load("resources/online-allowlist.php?cached")) {
+        log("FAIL: Explicit entry didn't override online allowlist.");
         hadError = true;
     }
 
-    if (load("resources/online-whitelist.php?uncached") == load("resources/online-whitelist.php?uncached")) {
-        log("FAIL: Online whitelist resource wasn't reloaded from network.");
+    if (load("resources/online-allowlist.php?uncached") == load("resources/online-allowlist.php?uncached")) {
+        log("FAIL: Online allowlist resource wasn't reloaded from network.");
         hadError = true;
     }
 
-    if (load("resources/online-whitelist.php?uncachedxxx") == load("resources/online-whitelist.php?uncachedxxx")) {
-        log("FAIL: Online whitelist resource wasn't reloaded from network (prefix matching).");
+    if (load("resources/online-allowlist.php?uncachedxxx") == load("resources/online-allowlist.php?uncachedxxx")) {
+        log("FAIL: Online allowlist resource wasn't reloaded from network (prefix matching).");
         hadError = true;
     }
 
-    if (canLoad("resources/online-whitelist.php?foobar")) {
+    if (canLoad("resources/online-allowlist.php?foobar")) {
         log("FAIL: Uncached resource was successfully loaded.");
         hadError = true;
     }

Copied: trunk/LayoutTests/http/tests/appcache/resources/allowlist-wildcard.manifest (from rev 271042, trunk/LayoutTests/http/tests/appcache/resources/whitelist-wildcard.manifest) (0 => 271043)


--- trunk/LayoutTests/http/tests/appcache/resources/allowlist-wildcard.manifest	                        (rev 0)
+++ trunk/LayoutTests/http/tests/appcache/resources/allowlist-wildcard.manifest	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,3 @@
+CACHE MANIFEST
+NETWORK:
+*

Copied: trunk/LayoutTests/http/tests/appcache/resources/online-allowlist.manifest (from rev 271042, trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.manifest) (0 => 271043)


--- trunk/LayoutTests/http/tests/appcache/resources/online-allowlist.manifest	                        (rev 0)
+++ trunk/LayoutTests/http/tests/appcache/resources/online-allowlist.manifest	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,14 @@
+CACHE MANIFEST
+online-allowlist.php?cached
+
+NETWORK:
+# These are prefixes for requests we test, but they are not same origin, so they will be skipped.
+http://
+http://127
+http://127.0.0.1:8
+
+# This should be ignored, because explicit entries are checked before online allowlist
+online-allowlist.php?cached
+
+# This should work normally.
+online-allowlist.php?uncached

Copied: trunk/LayoutTests/http/tests/appcache/resources/online-allowlist.php (from rev 271042, trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.php) (0 => 271043)


--- trunk/LayoutTests/http/tests/appcache/resources/online-allowlist.php	                        (rev 0)
+++ trunk/LayoutTests/http/tests/appcache/resources/online-allowlist.php	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,24 @@
+<?php
+require_once '../../resources/portabilityLayer.php';
+
+# This script may only be used by appcache/online-allowlist.html test, since it uses global data.
+$tmpFile = sys_get_temp_dir() . "/" . "appcache_online-allowlist_state";
+
+function stepCounter($file)
+{
+    if (!file_exists($file)) {
+        file_put_contents($file, "0");
+        return "0";
+    }
+    $value = file_get_contents($file);
+    file_put_contents($file, ++$value);
+    return $value;
+}
+
+header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
+header("Cache-Control: no-cache, must-revalidate");
+header("Pragma: no-cache");
+header("Content-Type: text/plain");
+
+print(stepCounter($tmpFile));
+?>

Deleted: trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.manifest (271042 => 271043)


--- trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.manifest	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.manifest	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,14 +0,0 @@
-CACHE MANIFEST
-online-whitelist.php?cached
-
-NETWORK:
-# These are prefixes for requests we test, but they are not same origin, so they will be skipped.
-http://
-http://127
-http://127.0.0.1:8
-
-# This should be ignored, because explicit entries are checked before online whitelist
-online-whitelist.php?cached
-
-# This should work normally.
-online-whitelist.php?uncached

Deleted: trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.php (271042 => 271043)


--- trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.php	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.php	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,24 +0,0 @@
-<?php
-require_once '../../resources/portabilityLayer.php';
-
-# This script may only be used by appcache/online-whitelist.html test, since it uses global data.
-$tmpFile = sys_get_temp_dir() . "/" . "appcache_online-whitelist_state";
-
-function stepCounter($file)
-{
-    if (!file_exists($file)) {
-        file_put_contents($file, "0");
-        return "0";
-    }
-    $value = file_get_contents($file);
-    file_put_contents($file, ++$value);
-    return $value;
-}
-
-header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
-header("Cache-Control: no-cache, must-revalidate");
-header("Pragma: no-cache");
-header("Content-Type: text/plain");
-
-print(stepCounter($tmpFile));
-?>

Deleted: trunk/LayoutTests/http/tests/appcache/resources/whitelist-wildcard.manifest (271042 => 271043)


--- trunk/LayoutTests/http/tests/appcache/resources/whitelist-wildcard.manifest	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/appcache/resources/whitelist-wildcard.manifest	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,3 +0,0 @@
-CACHE MANIFEST
-NETWORK:
-*

Modified: trunk/LayoutTests/http/tests/appcache/whitelist-wildcard-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/appcache/whitelist-wildcard-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/appcache/whitelist-wildcard-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
 CONSOLE MESSAGE: ApplicationCache is deprecated. Please use ServiceWorkers instead.
-Test that online whitelist wildcard flag is implemented.
+Test that online allowlist wildcard flag is implemented.
 
 SUCCESS

Modified: trunk/LayoutTests/http/tests/appcache/whitelist-wildcard.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/appcache/whitelist-wildcard.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/appcache/whitelist-wildcard.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,6 +1,6 @@
-<html manifest="resources/whitelist-wildcard.manifest">
+<html manifest="resources/allowlist-wildcard.manifest">
 <body>
-<p>Test that online whitelist wildcard flag is implemented.</p>
+<p>Test that online allowlist wildcard flag is implemented.</p>
 <script>
 if (window.testRunner) {
     testRunner.dumpAsText();

Deleted: trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blacklisted-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blacklisted-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blacklisted-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,10 +0,0 @@
-Test that character set BOCU-1 is not supported and we default to ISO-8859-1. With support for BOCU-1 the iframe renders a Cyrillic string. Without it renders garbage.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS charset is windows-1252
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blacklisted.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blacklisted.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blacklisted.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>BOCU-1 character set blacklisted</title>
-    <script src=""
-</head>
-<body>
-<script>
-    description("Test that character set BOCU-1 is not supported and we default to ISO-8859-1. With support for BOCU-1 the iframe renders a Cyrillic string. Without it renders garbage.");
-    window.jsTestIsAsync = true;
-    if (window.testRunner) {
-        testRunner.waitUntilDone();
-    }
-    function run() {
-        var bocu1Frame = document.getElementById("bocu1Frame");
-        if (bocu1Frame.contentDocument.charset == "windows-1252") {
-            testPassed("charset is windows-1252");
-        } else {
-            testFailed("charset is " + bocu1Frame.contentDocument.charset);
-        }
-        finishJSTest();
-    }
-</script>
-<iframe id="bocu1Frame" src="" _onload_="run()"></iframe>
-<script src=""
-</body>
-</html>

Copied: trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blocklisted-expected.txt (from rev 271042, trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blacklisted-expected.txt) (0 => 271043)


--- trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blocklisted-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blocklisted-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,10 @@
+Test that character set BOCU-1 is not supported and we default to ISO-8859-1. With support for BOCU-1 the iframe renders a Cyrillic string. Without it renders garbage.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS charset is windows-1252
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Copied: trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blocklisted.html (from rev 271042, trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blacklisted.html) (0 => 271043)


--- trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blocklisted.html	                        (rev 0)
+++ trunk/LayoutTests/http/tests/misc/char-encoding-bocu-1-blocklisted.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>BOCU-1 character set blocklisted</title>
+    <script src=""
+</head>
+<body>
+<script>
+    description("Test that character set BOCU-1 is not supported and we default to ISO-8859-1. With support for BOCU-1 the iframe renders a Cyrillic string. Without it renders garbage.");
+    window.jsTestIsAsync = true;
+    if (window.testRunner) {
+        testRunner.waitUntilDone();
+    }
+    function run() {
+        var bocu1Frame = document.getElementById("bocu1Frame");
+        if (bocu1Frame.contentDocument.charset == "windows-1252") {
+            testPassed("charset is windows-1252");
+        } else {
+            testFailed("charset is " + bocu1Frame.contentDocument.charset);
+        }
+        finishJSTest();
+    }
+</script>
+<iframe id="bocu1Frame" src="" _onload_="run()"></iframe>
+<script src=""
+</body>
+</html>

Deleted: trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blacklisted-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blacklisted-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blacklisted-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,10 +0,0 @@
-Test that character set SCSU is not supported and we default to ISO-8859-1. With support for SCSU the iframe renders a Cyrillic string. Without it renders garbage.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS charset is windows-1252
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Deleted: trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blacklisted.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blacklisted.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blacklisted.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>SCSU character set blacklisted</title>
-    <script src=""
-</head>
-<body>
-<script>
-    description("Test that character set SCSU is not supported and we default to ISO-8859-1. With support for SCSU the iframe renders a Cyrillic string. Without it renders garbage.");
-    window.jsTestIsAsync = true;
-    if (window.testRunner) {
-        testRunner.waitUntilDone();
-    }
-    function run() {
-        var scsuFrame = document.getElementById("scsuFrame");
-        if (scsuFrame.contentDocument.charset === "windows-1252") {
-            testPassed("charset is windows-1252");
-        } else {
-            testFailed("charset is " + scsuFrame.contentDocument.charset);
-        }
-        finishJSTest();
-    }
-</script>
-<iframe id="scsuFrame" src="" _onload_="run()"></iframe>
-<script src=""
-</body>
-</html>

Copied: trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blocklisted-expected.txt (from rev 271042, trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blacklisted-expected.txt) (0 => 271043)


--- trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blocklisted-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blocklisted-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,10 @@
+Test that character set SCSU is not supported and we default to ISO-8859-1. With support for SCSU the iframe renders a Cyrillic string. Without it renders garbage.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS charset is windows-1252
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

Copied: trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blocklisted.html (from rev 271042, trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blacklisted.html) (0 => 271043)


--- trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blocklisted.html	                        (rev 0)
+++ trunk/LayoutTests/http/tests/misc/char-encoding-scsu-blocklisted.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>SCSU character set blocklisted</title>
+    <script src=""
+</head>
+<body>
+<script>
+    description("Test that character set SCSU is not supported and we default to ISO-8859-1. With support for SCSU the iframe renders a Cyrillic string. Without it renders garbage.");
+    window.jsTestIsAsync = true;
+    if (window.testRunner) {
+        testRunner.waitUntilDone();
+    }
+    function run() {
+        var scsuFrame = document.getElementById("scsuFrame");
+        if (scsuFrame.contentDocument.charset === "windows-1252") {
+            testPassed("charset is windows-1252");
+        } else {
+            testFailed("charset is " + scsuFrame.contentDocument.charset);
+        }
+        finishJSTest();
+    }
+</script>
+<iframe id="scsuFrame" src="" _onload_="run()"></iframe>
+<script src=""
+</body>
+</html>

Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,6 +1,6 @@
 CONSOLE MESSAGE: Refused to apply a stylesheet because its hash, its nonce, or 'unsafe-inline' does not appear in the style-src directive of the Content Security Policy.
 CONSOLE MESSAGE: Refused to apply a stylesheet because its hash, its nonce, or 'unsafe-inline' does not appear in the style-src directive of the Content Security Policy.
-Style correctly whitelisted via a 'nonce-*' _expression_ in 'style-src' should be applied to the page.
+Style correctly allowed via a 'nonce-*' _expression_ in 'style-src' should be applied to the page.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 

Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/stylenonce-allowed.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -23,7 +23,7 @@
         <p id="test1">This text should be green.</p>
         <p id="test2">This text should also be green.</p>
         <script>
-            description("Style correctly whitelisted via a 'nonce-*' _expression_ in 'style-src' should be applied to the page.");    
+            description("Style correctly allowed via a 'nonce-*' _expression_ in 'style-src' should be applied to the page.");    
             var el = document.querySelector('#test1');
             shouldBeEqualToString("window.getComputedStyle(el).color", "rgb(0, 128, 0)");
             var el = document.querySelector('#test2');

Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -3,7 +3,7 @@
 CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js because it does not appear in the script-src directive of the Content Security Policy.
 CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js because it does not appear in the script-src directive of the Content Security Policy.
 CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/RESOURCES/script.js because it does not appear in the script-src directive of the Content Security Policy.
-Resources should be rejected unless they match a whitelisted path.
+Resources should be rejected unless they match an allowlisted path.
 
 
 

Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-01.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -19,5 +19,5 @@
 </head>
 <body _onload_="test()">
   <p>
-    Resources should be rejected unless they match a whitelisted path.
+    Resources should be rejected unless they match an allowlisted path.
   </p>

Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -6,7 +6,7 @@
 CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js because it does not appear in the script-src directive of the Content Security Policy.
 CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js because it does not appear in the script-src directive of the Content Security Policy.
 CONSOLE MESSAGE: Refused to load http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js because it does not appear in the script-src directive of the Content Security Policy.
-Resources should be rejected unless they match a whitelisted path.
+Resources should be rejected unless they match an allowlisted path.
 
 
 

Modified: trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/contentSecurityPolicy/source-list-parsing-paths-02.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -17,5 +17,5 @@
 </head>
 <body _onload_="test()">
   <p>
-    Resources should be rejected unless they match a whitelisted path.
+    Resources should be rejected unless they match an allowlisted path.
   </p>

Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -9,13 +9,13 @@
 PASS: Cross frame access by enumerating the Location object was denied.
 PASS: Cross frame access by getting the keys of the Location object was denied.
 PASS: Cross frame access by getting the property names of the Location object was denied.
-PASS: areArraysEqual(Object.getOwnPropertyNames(b_win).sort(), whitelistedWindowIndices.concat(whitelistedWindowPropNames).sort()) should be 'true' and is.
-PASS: areArraysEqual(indexedWindowProps, whitelistedWindowIndices) should be 'true' and is.
-PASS: areArraysEqual(stringWindowProps.sort(), whitelistedWindowPropNames) should be 'true' and is.
-PASS: areArraysEqual(symbolWindowProps, whitelistedSymbols) should be 'true' and is.
-PASS: areArraysEqual(Object.getOwnPropertyNames(b_win.location).sort(), whitelistedLocationPropNames.sort()) should be 'true' and is.
-PASS: areArraysEqual(stringLocationProps.sort(), whitelistedLocationPropNames) should be 'true' and is.
-PASS: areArraysEqual(symbolLocationProps, whitelistedSymbols) should be 'true' and is.
+PASS: areArraysEqual(Object.getOwnPropertyNames(b_win).sort(), allowlistedWindowIndices.concat(allowlistedWindowPropNames).sort()) should be 'true' and is.
+PASS: areArraysEqual(indexedWindowProps, allowlistedWindowIndices) should be 'true' and is.
+PASS: areArraysEqual(stringWindowProps.sort(), allowlistedWindowPropNames) should be 'true' and is.
+PASS: areArraysEqual(symbolWindowProps, allowlistedSymbols) should be 'true' and is.
+PASS: areArraysEqual(Object.getOwnPropertyNames(b_win.location).sort(), allowlistedLocationPropNames.sort()) should be 'true' and is.
+PASS: areArraysEqual(stringLocationProps.sort(), allowlistedLocationPropNames) should be 'true' and is.
+PASS: areArraysEqual(symbolLocationProps, allowlistedSymbols) should be 'true' and is.
 PASS: successfullyParsed should be 'true' and is.
 
 TEST COMPLETE

Modified: trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/cross-frame-access-enumeration.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -86,27 +86,27 @@
             log("PASS: Cross frame access by getting the property names of the Location object was denied.");
 
             // Window.
-            whitelistedWindowIndices = ['0', '1', '2'];
-            whitelistedWindowPropNames = ['blur', 'close', 'closed', 'focus', 'frames', 'length', 'location', 'opener', 'parent', 'postMessage', 'self', 'then', 'top', 'window'];
-            whitelistedSymbols = [Symbol.toStringTag, Symbol.hasInstance, Symbol.isConcatSpreadable];
-            shouldBeTrue("areArraysEqual(Object.getOwnPropertyNames(b_win).sort(), whitelistedWindowIndices.concat(whitelistedWindowPropNames).sort())");
+            allowlistedWindowIndices = ['0', '1', '2'];
+            allowlistedWindowPropNames = ['blur', 'close', 'closed', 'focus', 'frames', 'length', 'location', 'opener', 'parent', 'postMessage', 'self', 'then', 'top', 'window'];
+            allowlistedSymbols = [Symbol.toStringTag, Symbol.hasInstance, Symbol.isConcatSpreadable];
+            shouldBeTrue("areArraysEqual(Object.getOwnPropertyNames(b_win).sort(), allowlistedWindowIndices.concat(allowlistedWindowPropNames).sort())");
             allWindowProps = Reflect.ownKeys(b_win);
-            indexedWindowProps = allWindowProps.slice(0, whitelistedWindowIndices.length);
-            stringWindowProps = allWindowProps.slice(whitelistedWindowIndices.length, -1 * whitelistedSymbols.length);
-            symbolWindowProps = allWindowProps.slice(-1 * whitelistedSymbols.length);
-            shouldBeTrue("areArraysEqual(indexedWindowProps, whitelistedWindowIndices)"); // Reflect.ownKeys should start with the indices exposed on the cross-origin window.
-            shouldBeTrue("areArraysEqual(stringWindowProps.sort(), whitelistedWindowPropNames)"); // Reflect.ownKeys should continue with the cross-origin window properties for a cross-origin Window.
-            shouldBeTrue("areArraysEqual(symbolWindowProps, whitelistedSymbols)"); // Reflect.ownKeys should end with the cross-origin symbols for a cross-origin Window.
+            indexedWindowProps = allWindowProps.slice(0, allowlistedWindowIndices.length);
+            stringWindowProps = allWindowProps.slice(allowlistedWindowIndices.length, -1 * allowlistedSymbols.length);
+            symbolWindowProps = allWindowProps.slice(-1 * allowlistedSymbols.length);
+            shouldBeTrue("areArraysEqual(indexedWindowProps, allowlistedWindowIndices)"); // Reflect.ownKeys should start with the indices exposed on the cross-origin window.
+            shouldBeTrue("areArraysEqual(stringWindowProps.sort(), allowlistedWindowPropNames)"); // Reflect.ownKeys should continue with the cross-origin window properties for a cross-origin Window.
+            shouldBeTrue("areArraysEqual(symbolWindowProps, allowlistedSymbols)"); // Reflect.ownKeys should end with the cross-origin symbols for a cross-origin Window.
 
             // Location.
-            whitelistedLocationPropNames = ['href', 'replace', 'then'];
+            allowlistedLocationPropNames = ['href', 'replace', 'then'];
             allLocationProps = Reflect.ownKeys(b_win.location);
-            stringLocationProps = allLocationProps.slice(0, -1 * whitelistedSymbols.length);
-            symbolLocationProps = allLocationProps.slice(-1 * whitelistedSymbols.length);
+            stringLocationProps = allLocationProps.slice(0, -1 * allowlistedSymbols.length);
+            symbolLocationProps = allLocationProps.slice(-1 * allowlistedSymbols.length);
 
-            shouldBeTrue("areArraysEqual(Object.getOwnPropertyNames(b_win.location).sort(), whitelistedLocationPropNames.sort())");
-            shouldBeTrue("areArraysEqual(stringLocationProps.sort(), whitelistedLocationPropNames)"); // Reflect.ownKeys should start with the cross-origin window properties for a cross-origin Location.
-            shouldBeTrue("areArraysEqual(symbolLocationProps, whitelistedSymbols)"); // Reflect.ownKeys should end with the cross-origin symbols for a cross-origin Location.
+            shouldBeTrue("areArraysEqual(Object.getOwnPropertyNames(b_win.location).sort(), allowlistedLocationPropNames.sort())");
+            shouldBeTrue("areArraysEqual(stringLocationProps.sort(), allowlistedLocationPropNames)"); // Reflect.ownKeys should start with the cross-origin window properties for a cross-origin Location.
+            shouldBeTrue("areArraysEqual(symbolLocationProps, allowlistedSymbols)"); // Reflect.ownKeys should end with the cross-origin symbols for a cross-origin Location.
         }
     </script>
 </head>

Modified: trunk/LayoutTests/http/tests/security/isolatedWorld/cross-origin-xhr-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/isolatedWorld/cross-origin-xhr-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/isolatedWorld/cross-origin-xhr-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -12,9 +12,9 @@
 XHR completed with status 0
 XHR from isolated world with same security origin as XHR target
 XHR completed with status 200
-XHR from isolated world with security origin that is whitelisted for XHR target
+XHR from isolated world with security origin that is allowlisted for XHR target
 XHR completed with status 200
-XHR from main world is not affected by the isolated world origin or whitelist
+XHR from main world is not affected by the isolated world origin or allowlist
 XHR completed with status 0
 PASS successfullyParsed is true
 

Modified: trunk/LayoutTests/http/tests/security/isolatedWorld/cross-origin-xhr.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/isolatedWorld/cross-origin-xhr.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/isolatedWorld/cross-origin-xhr.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -25,13 +25,13 @@
         runTestInWorld(1, 'xhr');
     },
     function() {
-        debug('XHR from isolated world with security origin that is whitelisted for XHR target');
+        debug('XHR from isolated world with security origin that is allowlisted for XHR target');
         testRunner.setIsolatedWorldSecurityOrigin(2, 'chrome-extension://123');
         testRunner.addOriginAccessAllowListEntry('chrome-extension://123', 'http', 'localhost', false);
         runTestInWorld(2, 'xhr');
     },
     function() {
-        debug('XHR from main world is not affected by the isolated world origin or whitelist');
+        debug('XHR from main world is not affected by the isolated world origin or allowlist');
         xhr();
     }
 ];

Modified: trunk/LayoutTests/http/tests/security/local-image-from-remote-allow-list-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/local-image-from-remote-allow-list-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/local-image-from-remote-allow-list-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
 
-This test is to see if a remote file can include a local image when the access has been white listed using addOriginAccessAllowListEntry.
+This test is to see if a remote file can include a local image when the access has been allowed using addOriginAccessAllowListEntry.
 
 Test Passed. Local image loaded remotely.

Modified: trunk/LayoutTests/http/tests/security/local-image-from-remote-allow-list.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/security/local-image-from-remote-allow-list.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/security/local-image-from-remote-allow-list.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -24,7 +24,7 @@
 </script>
 
 <p>This test is to see if a remote file can include a local image when the
-access has been white listed using addOriginAccessAllowListEntry.
+access has been allowed using addOriginAccessAllowListEntry.
 
 <p id=result>Test has not run.
 

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -5,5 +5,5 @@
 PASS: Response header last-modified allowed.
 PASS: Response header pragma allowed.
 PASS: Response header x-webkit denied.
-PASS: Non-whitelisted headers not passed to getAllResponseHeaders().
+PASS: Non-allowlisted headers not passed to getAllResponseHeaders().
 

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-list-response-headers.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -44,9 +44,9 @@
 
     // Test getAllResponseHeaders()
     if (!xhr.getAllResponseHeaders().match("foobar"))
-        log("PASS: Non-whitelisted headers not passed to getAllResponseHeaders().");
+        log("PASS: Non-allowlisted headers not passed to getAllResponseHeaders().");
     else
-        log("FAIL: Non-whitelisted headers passed to getAllResponseHeaders().");
+        log("FAIL: Non-allowlisted headers passed to getAllResponseHeaders().");
 </script>
 </body>
 </html>

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -20,7 +20,7 @@
         return;
     }
 
-    // Non-whitelisted method
+    // Non-allowlisted method
     xhr.setRequestHeader("x-webkit", "foobar");
 
     // This is going to fail because the cgi script is not prepared for an OPTIONS request. 

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -40,7 +40,7 @@
 
     try {
         xhr.send("FAIL: PUT data received");
-        log("FAIL: Exception not thrown. Cross-domain access was allowed, even though content type was not on white list.");
+        log("FAIL: Exception not thrown. Cross-domain access was allowed, even though content type was not on allow list.");
         log(xhr.responseText);
     } catch(e) {
         log("PASS: Exception thrown. Cross-domain access is not allowed in 'send'. [" + e.message + "].");

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-all-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-all-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-all-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-Tests the special case of whitelisting all origins.
+Tests the special case of allowlisting all origins.
 
 Testing: http://localhost:8000/xmlhttprequest/resources/get.txt (sync)
 PASS: PASS

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-all.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-all.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-all.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-<p>Tests the special case of whitelisting all origins.</p>
+<p>Tests the special case of allowlisting all origins.</p>
 
 <pre id="console"></pre>
 <script>
@@ -43,7 +43,7 @@
 {
     var iframe = document.createElement("iframe");
     document.body.appendChild(iframe);
-    iframe.src = ""
+    iframe.src = ""
     window.addEventListener("message", function(e) {
         if (e.data == "DONE")
             testRunner.notifyDone();

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-exact-match-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-exact-match-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-exact-match-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-Tests the behavior of whitelisting origins using exact matching.
+Tests the behavior of allowlisting origins using exact matching.
 
 Testing: http://localhost:8000/xmlhttprequest/resources/get.txt (sync)
 PASS: PASS

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-exact-match.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-exact-match.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-exact-match.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-<p>Tests the behavior of whitelisting origins using exact matching.</p>
+<p>Tests the behavior of allowlisting origins using exact matching.</p>
 
 <pre id="console"></pre>
 <script>

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-https-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-https-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-https-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -2,7 +2,7 @@
 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
-Tests that origin whitelisting for https does not match http URLs.
+Tests that origin allowlisting for https does not match http URLs.
 
 Testing: http://localhost:8000/xmlhttprequest/resources/get.txt (sync)
 PASS: NetworkError:  A network error occurred.

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-https.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-https.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-https.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-<p>Tests that origin whitelisting for https does not match http URLs.</p>
+<p>Tests that origin allowlisting for https does not match http URLs.</p>
 
 <pre id="console"></pre>
 <script>

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-ip-addresses-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-ip-addresses-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-ip-addresses-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-Tests origin whitelisting with IP addresses.
+Tests origin allowlisting with IP addresses.
 
 Testing: http://127.0.0.1:8000/xmlhttprequest/resources/get.txt (sync)
 PASS: PASS

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-ip-addresses-with-subdomains.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-ip-addresses-with-subdomains.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-ip-addresses-with-subdomains.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -12,7 +12,7 @@
 
 var iframe = document.createElement("iframe");
 document.body.appendChild(iframe);
-iframe.src = ""
+iframe.src = ""
 window.addEventListener("message", function(e) {
     if (e.data == "DONE")
         testRunner.notifyDone();

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-ip-addresses.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-ip-addresses.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-ip-addresses.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-<p>Tests origin whitelisting with IP addresses.</p>
+<p>Tests origin allowlisting with IP addresses.</p>
 <pre id="console"></pre>
 <script>
 testRunner.dumpAsText();
@@ -12,7 +12,7 @@
 
 var iframe = document.createElement("iframe");
 document.body.appendChild(iframe);
-iframe.src = ""
+iframe.src = ""
 window.addEventListener("message", function(e) {
     if (e.data == "DONE")
         testRunner.notifyDone();

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-removal-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-removal-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-removal-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -14,7 +14,7 @@
 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
-Tests the behavior of whitelisting origins and removing them later.
+Tests the behavior of allowlisting origins and removing them later.
 
 Testing: source origin: http://127.0.0.1:8000 destination origin: http:localhost
 Loading: http://localhost:8000/xmlhttprequest/resources/get.txt (expecting NETWORK_ERR)

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-removal.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-removal.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-removal.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-<p>Tests the behavior of whitelisting origins and removing them later.</p>
+<p>Tests the behavior of allowlisting origins and removing them later.</p>
 
 <pre id="console"></pre>
 <script>

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-subdomains-expected.txt (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-subdomains-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-subdomains-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-Tests origin whitelisting subdomain behavior.
+Tests origin allowlisting subdomain behavior.
 
 Testing: http://localhost:8000/xmlhttprequest/resources/get.txt (sync)
 PASS: PASS

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-subdomains.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-subdomains.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/origin-allow-list-subdomains.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,4 +1,4 @@
-<p>Tests origin whitelisting subdomain behavior.</p>
+<p>Tests origin allowlisting subdomain behavior.</p>
 
 <pre id="console"></pre>
 <script>

Copied: trunk/LayoutTests/http/tests/xmlhttprequest/resources/origin-allowlisting-ip-address-test.html (from rev 271042, trunk/LayoutTests/http/tests/xmlhttprequest/resources/origin-whitelisting-ip-address-test.html) (0 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/resources/origin-allowlisting-ip-address-test.html	                        (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resources/origin-allowlisting-ip-address-test.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,34 @@
+<p>Tests origin allowlisting to an IP address.</p>
+<p>Intended to be run in an iframe. Notifies success/failure via postMessage().</p>
+
+<pre id="console"></pre>
+<script>
+function log(message)
+{
+    window.parent.postMessage(message, "http://127.0.0.1:8000");
+}
+
+var url = ""
+log("Testing: " + url + " (sync)");
+var req = new XMLHttpRequest();
+req.open("GET", url, false);
+try {
+    req.send(null);
+    log("PASS: " + req.responseText);
+} catch (e) {
+    log("FAIL: " + e);
+}
+
+log("Testing: " + url + " (async)");
+req = new XMLHttpRequest();
+req.open("GET", url, true);
+req._onload_ = function() {
+    log("PASS: " + req.responseText);
+    log("DONE");
+};
+req._onerror_ = function() {
+    log("FAIL: " + req.status);
+    log("DONE");
+};
+req.send(null);
+</script>

Deleted: trunk/LayoutTests/http/tests/xmlhttprequest/resources/origin-whitelisting-ip-address-test.html (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/resources/origin-whitelisting-ip-address-test.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resources/origin-whitelisting-ip-address-test.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,34 +0,0 @@
-<p>Tests origin whitelisting to an IP address.</p>
-<p>Intended to be run in an iframe. Notifies success/failure via postMessage().</p>
-
-<pre id="console"></pre>
-<script>
-function log(message)
-{
-    window.parent.postMessage(message, "http://127.0.0.1:8000");
-}
-
-var url = ""
-log("Testing: " + url + " (sync)");
-var req = new XMLHttpRequest();
-req.open("GET", url, false);
-try {
-    req.send(null);
-    log("PASS: " + req.responseText);
-} catch (e) {
-    log("FAIL: " + e);
-}
-
-log("Testing: " + url + " (async)");
-req = new XMLHttpRequest();
-req.open("GET", url, true);
-req._onload_ = function() {
-    log("PASS: " + req.responseText);
-    log("DONE");
-};
-req._onerror_ = function() {
-    log("FAIL: " + req.status);
-    log("DONE");
-};
-req.send(null);
-</script>

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/workers/resources/access-control-basic-get-fail-non-simple.js (271042 => 271043)


--- trunk/LayoutTests/http/tests/xmlhttprequest/workers/resources/access-control-basic-get-fail-non-simple.js	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/workers/resources/access-control-basic-get-fail-non-simple.js	2020-12-21 23:50:35 UTC (rev 271043)
@@ -32,7 +32,7 @@
     try {
 	var xhr = new XMLHttpRequest;
 	xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-basic-get-fail-non-simple.cgi", false);
-	// Non-whitelisted method
+	// Non-allowlisted method
 	xhr.setRequestHeader("x-webkit", "foobar");
         xhr.send();
     } catch(e) {

Modified: trunk/LayoutTests/inspector/timeline/line-column.html (271042 => 271043)


--- trunk/LayoutTests/inspector/timeline/line-column.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/inspector/timeline/line-column.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -41,10 +41,10 @@
     InspectorProtocol.sendCommand("Timeline.enable");
 
     // To avoid flakiness print only events that we always expect.
-    const eventWhitelist = new Set(["RenderingFrame", "ConsoleProfile", "EventDispatch", "FunctionCall"]);
+    const eventAllowlist = new Set(["RenderingFrame", "ConsoleProfile", "EventDispatch", "FunctionCall"]);
     function replacer(key, value) {
         if (key === "children" && this.startTime)
-            return value.filter(e => eventWhitelist.has(e.type));
+            return value.filter(e => eventAllowlist.has(e.type));
         if (key === "startTime" || key === "endTime" || key === "scriptId" || key === "frameId")
             return "<filtered>";
         if (key === "url" || key === "scriptName")

Modified: trunk/LayoutTests/js/promises-tests/resources/mocha.js (271042 => 271043)


--- trunk/LayoutTests/js/promises-tests/resources/mocha.js	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/js/promises-tests/resources/mocha.js	2020-12-21 23:50:35 UTC (rev 271043)
@@ -4298,7 +4298,7 @@
 };
 
 /**
- * Whitelist these globals for this test run
+ * Allowlist these globals for this test run
  *
  * @api private
  */
@@ -5980,4 +5980,4 @@
  */
 
 Mocha.process = process;
-})();
\ No newline at end of file
+})();

Copied: trunk/LayoutTests/media/track/captions-webvtt/allowlist.vtt (from rev 271042, trunk/LayoutTests/media/track/captions-webvtt/whitelist.vtt) (0 => 271043)


--- trunk/LayoutTests/media/track/captions-webvtt/allowlist.vtt	                        (rev 0)
+++ trunk/LayoutTests/media/track/captions-webvtt/allowlist.vtt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,5 @@
+WEBVTT
+
+1
+00:00.000 --> 00:00.200
+<c.red>One,</c> <c>two,</c> <c>three.</c>

Deleted: trunk/LayoutTests/media/track/captions-webvtt/whitelist.vtt (271042 => 271043)


--- trunk/LayoutTests/media/track/captions-webvtt/whitelist.vtt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/media/track/captions-webvtt/whitelist.vtt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,5 +0,0 @@
-WEBVTT
-
-1
-00:00.000 --> 00:00.200
-<c.red>One,</c> <c>two,</c> <c>three.</c>

Copied: trunk/LayoutTests/media/track/track-css-property-allowlist-expected.txt (from rev 271042, trunk/LayoutTests/media/track/track-css-property-whitelist-expected.txt) (0 => 271043)


--- trunk/LayoutTests/media/track/track-css-property-allowlist-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/media/track/track-css-property-allowlist-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,21 @@
+
+This should display inline
+EVENT(canplaythrough)
+EVENT(seeked)
+
+
+Test that only allowed for the ::cue pseudo-element properties are applied to WebVTT node objects.
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
+EXPECTED (getComputedStyle(cueNode).padding == '0px') OK
+EXPECTED (getComputedStyle(cueNode).wordSpacing == '0px') OK
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
+EXPECTED (getComputedStyle(cueNode).padding == '0px') OK
+EXPECTED (getComputedStyle(cueNode).wordSpacing == '0px') OK
+EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
+EXPECTED (getComputedStyle(cueNode).padding == '0px') OK
+EXPECTED (getComputedStyle(cueNode).wordSpacing == '0px') OK
+
+Test that filtering doesn't apply to elements which class equals 'cue' outside WebVTT scope.
+EXPECTED (getComputedStyle(cueNode).display == 'inline') OK
+END OF TEST
+

Copied: trunk/LayoutTests/media/track/track-css-property-allowlist.html (from rev 271042, trunk/LayoutTests/media/track/track-css-property-whitelist.html) (0 => 271043)


--- trunk/LayoutTests/media/track/track-css-property-allowlist.html	                        (rev 0)
+++ trunk/LayoutTests/media/track/track-css-property-allowlist.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+        <script src=""
+        <script src=""
+        <script src=""
+
+        <style>
+        ::cue {word-spacing: 100px;}
+        ::cue(c) {padding-left: 10px; color: red;}
+        .cue {
+            display: inline;
+            background-color: green;
+        }
+        </style>
+
+        <script>
+
+        var cueNode;
+
+        function seeked()
+        {
+            if (testEnded)
+                return;
+
+            consoleWrite("<br>");
+            consoleWrite("Test that only allowed for the ::cue pseudo-element properties are applied to WebVTT node objects.");
+
+            cueNode = textTrackDisplayElement(video, 'cue').firstElementChild;
+            testExpected("getComputedStyle(cueNode).color", "rgb(255, 0, 0)");
+            testExpected("getComputedStyle(cueNode).padding", "0px");
+            testExpected("getComputedStyle(cueNode).wordSpacing", "0px");
+            cueNode = cueNode.nextElementSibling;
+            testExpected("getComputedStyle(cueNode).color", "rgb(255, 0, 0)");
+            testExpected("getComputedStyle(cueNode).padding", "0px");
+            testExpected("getComputedStyle(cueNode).wordSpacing", "0px");
+            cueNode = cueNode.nextElementSibling;
+            testExpected("getComputedStyle(cueNode).color", "rgb(255, 0, 0)");
+            testExpected("getComputedStyle(cueNode).padding", "0px");
+            testExpected("getComputedStyle(cueNode).wordSpacing", "0px");
+            
+            consoleWrite("<br>Test that filtering doesn't apply to elements which class equals 'cue' outside WebVTT scope.");
+            cueNode = document.getElementsByClassName("cue")[0];
+            testExpected("getComputedStyle(cueNode).display", "inline");
+            endTest();
+        }
+
+        function loaded()
+        {
+            findMediaElement();
+            video.src = "" '../content/test');
+            video.id = "testvideo";
+            waitForEvent('seeked', seeked);
+            waitForEvent('canplaythrough', function() { video.currentTime = 0.1; });
+        }
+
+        setCaptionDisplayMode('Automatic');
+        </script>
+    </head>
+    <body _onload_="loaded()">
+        <video controls >
+            <track src="" kind="captions" default>
+        </video>
+        <div><div class="cue">This should display inline</div></div>
+    </body>
+</html>

Deleted: trunk/LayoutTests/media/track/track-css-property-whitelist-expected.txt (271042 => 271043)


--- trunk/LayoutTests/media/track/track-css-property-whitelist-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/media/track/track-css-property-whitelist-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,21 +0,0 @@
-
-This should display inline
-EVENT(canplaythrough)
-EVENT(seeked)
-
-
-Test that only allowed for the ::cue pseudo-element properties are applied to WebVTT node objects.
-EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
-EXPECTED (getComputedStyle(cueNode).padding == '0px') OK
-EXPECTED (getComputedStyle(cueNode).wordSpacing == '0px') OK
-EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
-EXPECTED (getComputedStyle(cueNode).padding == '0px') OK
-EXPECTED (getComputedStyle(cueNode).wordSpacing == '0px') OK
-EXPECTED (getComputedStyle(cueNode).color == 'rgb(255, 0, 0)') OK
-EXPECTED (getComputedStyle(cueNode).padding == '0px') OK
-EXPECTED (getComputedStyle(cueNode).wordSpacing == '0px') OK
-
-Test that filtering doesn't apply to elements which class equals 'cue' outside WebVTT scope.
-EXPECTED (getComputedStyle(cueNode).display == 'inline') OK
-END OF TEST
-

Deleted: trunk/LayoutTests/media/track/track-css-property-whitelist.html (271042 => 271043)


--- trunk/LayoutTests/media/track/track-css-property-whitelist.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/media/track/track-css-property-whitelist.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1,68 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
-        <script src=""
-        <script src=""
-        <script src=""
-
-        <style>
-        ::cue {word-spacing: 100px;}
-        ::cue(c) {padding-left: 10px; color: red;}
-        .cue {
-            display: inline;
-            background-color: green;
-        }
-        </style>
-
-        <script>
-
-        var cueNode;
-
-        function seeked()
-        {
-            if (testEnded)
-                return;
-
-            consoleWrite("<br>");
-            consoleWrite("Test that only allowed for the ::cue pseudo-element properties are applied to WebVTT node objects.");
-
-            cueNode = textTrackDisplayElement(video, 'cue').firstElementChild;
-            testExpected("getComputedStyle(cueNode).color", "rgb(255, 0, 0)");
-            testExpected("getComputedStyle(cueNode).padding", "0px");
-            testExpected("getComputedStyle(cueNode).wordSpacing", "0px");
-            cueNode = cueNode.nextElementSibling;
-            testExpected("getComputedStyle(cueNode).color", "rgb(255, 0, 0)");
-            testExpected("getComputedStyle(cueNode).padding", "0px");
-            testExpected("getComputedStyle(cueNode).wordSpacing", "0px");
-            cueNode = cueNode.nextElementSibling;
-            testExpected("getComputedStyle(cueNode).color", "rgb(255, 0, 0)");
-            testExpected("getComputedStyle(cueNode).padding", "0px");
-            testExpected("getComputedStyle(cueNode).wordSpacing", "0px");
-            
-            consoleWrite("<br>Test that filtering doesn't apply to elements which class equals 'cue' outside WebVTT scope.");
-            cueNode = document.getElementsByClassName("cue")[0];
-            testExpected("getComputedStyle(cueNode).display", "inline");
-            endTest();
-        }
-
-        function loaded()
-        {
-            findMediaElement();
-            video.src = "" '../content/test');
-            video.id = "testvideo";
-            waitForEvent('seeked', seeked);
-            waitForEvent('canplaythrough', function() { video.currentTime = 0.1; });
-        }
-
-        setCaptionDisplayMode('Automatic');
-        </script>
-    </head>
-    <body _onload_="loaded()">
-        <video controls >
-            <track src="" kind="captions" default>
-        </video>
-        <div><div class="cue">This should display inline</div></div>
-    </body>
-</html>

Modified: trunk/LayoutTests/platform/glib/TestExpectations (271042 => 271043)


--- trunk/LayoutTests/platform/glib/TestExpectations	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/platform/glib/TestExpectations	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1508,7 +1508,7 @@
 Bug(GLIB) http/tests/contentextensions/subresource-redirect-blocked.html [ Failure ]
 Bug(GLIB) http/tests/contentextensions/text-track-blocked.html [ Failure ]
 Bug(GLIB) http/tests/contentextensions/top-url.html [ Failure ]
-Bug(GLIB) http/tests/contentextensions/whitelist.html [ Failure ]
+Bug(GLIB) http/tests/contentextensions/allowlist.html [ Failure ]
 
 # TODO: Relocate to corresponding section.
 

Modified: trunk/LayoutTests/platform/mac/TestExpectations (271042 => 271043)


--- trunk/LayoutTests/platform/mac/TestExpectations	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/platform/mac/TestExpectations	2020-12-21 23:50:35 UTC (rev 271043)
@@ -2081,8 +2081,8 @@
 # <rdar://problem/64170117> REGRESSION(20A296a-20A301a): fast/text/arabic-zwj-and-zwnj.html is a constant failure
 [ BigSur+ ] fast/text/arabic-zwj-and-zwnj.html [ Pass ImageOnlyFailure ]
 
-# <rdar://problem/64166412> REGRESSION(20A296a-20A301a): fast/text/arabic-blacklisted.html is a constant failure
-[ BigSur+ ] fast/text/arabic-blacklisted.html [ Pass ImageOnlyFailure ]
+# <rdar://problem/64166412> REGRESSION(20A296a-20A301a): fast/text/arabic-blocked-fonts.html is a constant failure
+[ BigSur+ ] fast/text/arabic-blocked-fonts.html [ Pass ImageOnlyFailure ]
 
 # <rdar://problem/64546452> mathml/opentype/munderover-stretch-width.html is flaky failing.
 [ BigSur+ ] mathml/opentype/munderover-stretch-width.html [ Pass Failure ]
@@ -2257,4 +2257,4 @@
 
 webkit.org/b/219907 imported/w3c/web-platform-tests/server-timing/service_worker_idl.html [ Pass Failure ]
 
-webkit.org/b/219965 [ BigSur ] imported/w3c/web-platform-tests/fetch/content-type/script.window.html [ Pass Failure ]
\ No newline at end of file
+webkit.org/b/219965 [ BigSur ] imported/w3c/web-platform-tests/fetch/content-type/script.window.html [ Pass Failure ]

Modified: trunk/LayoutTests/platform/win/TestExpectations (271042 => 271043)


--- trunk/LayoutTests/platform/win/TestExpectations	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/platform/win/TestExpectations	2020-12-21 23:50:35 UTC (rev 271043)
@@ -1086,7 +1086,7 @@
 media/track/track-css-matching.html [ Skip ] # Timeout
 media/track/track-css-matching-lang.html [ Skip ] # Timeout
 media/track/track-css-matching-timestamps.html [ Skip ] # Timeout
-media/track/track-css-property-whitelist.html [ Skip ] # Timeout
+media/track/track-css-property-allowlist.html [ Skip ] # Timeout
 media/track/track-css-user-override.html [ Skip ] # Timeout
 media/track/track-cue-nothing-to-render.html [ Skip ] # Timeout
 media/track/track-cue-rendering.html [ Skip ] # Timeout
@@ -3131,7 +3131,7 @@
 webkit.org/b/137093 svg/custom/glyph-selection-lang-attribute.svg [ Failure ]
 
 # This test relies on iOS-specific font fallback.
-fast/text/arabic-blacklisted.html [ Pass ImageOnlyFailure ]
+fast/text/arabic-blocked-fonts.html [ Pass ImageOnlyFailure ]
 
 # dumpPolicyDelegateCallbacks is not supported in DumpRenderTree
 fast/loader/iframe-src-invalid-url.html [ Skip ]

Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (271042 => 271043)


--- trunk/LayoutTests/platform/wincairo/TestExpectations	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations	2020-12-21 23:50:35 UTC (rev 271043)
@@ -403,7 +403,7 @@
 fast/text/hidpi-text-selection-gap-between-words.html [ Skip ]
 
 # This test relies on iOS-specific font fallback.
-fast/text/arabic-blacklisted.html [ Pass ImageOnlyFailure ]
+fast/text/arabic-blocked-fonts.html [ Pass ImageOnlyFailure ]
 
 # the test that uses these methods is Cocoa-specific, see webkit.org/b/152247
 fast/forms/attributed-strings.html [ Failure ]

Modified: trunk/LayoutTests/platform/wpe/security/block-test-expected.txt (271042 => 271043)


--- trunk/LayoutTests/platform/wpe/security/block-test-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/platform/wpe/security/block-test-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -149,6 +149,6 @@
 ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 101, failing URL "ftp://255.255.255.255/test.jpg">
 ftp://255.255.255.255:22/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255:22/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 ftp://255.255.255.255:22/test.jpg - didFailLoadingWithError: <NSError domain WebKitErrorDomain, code 101, failing URL "ftp://255.255.255.255:22/test.jpg">
-This test attempts to change the src of an IMG tag to all black listed ports to confirm that WebKit returns the correct error for them - blocked instead of cannot find. It also tries the FTP ports for exemptions. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree
+This test attempts to change the src of an IMG tag to all blocked ports to confirm that WebKit returns the correct error for them - blocked instead of cannot find. It also tries the FTP ports for exemptions. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree
 
 

Modified: trunk/LayoutTests/security/block-test-expected.txt (271042 => 271043)


--- trunk/LayoutTests/security/block-test-expected.txt	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/security/block-test-expected.txt	2020-12-21 23:50:35 UTC (rev 271043)
@@ -149,6 +149,6 @@
 ftp://255.255.255.255/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1, failing URL "ftp://255.255.255.255/test.jpg">
 ftp://255.255.255.255:22/test.jpg - willSendRequest <NSURLRequest URL ftp://255.255.255.255:22/test.jpg, main document URL block-test.html, http method GET> redirectResponse (null)
 ftp://255.255.255.255:22/test.jpg - didFailLoadingWithError: <NSError domain NSURLErrorDomain, code -1, failing URL "ftp://255.255.255.255:22/test.jpg">
-This test attempts to change the src of an IMG tag to all black listed ports to confirm that WebKit returns the correct error for them - blocked instead of cannot find. It also tries the FTP ports for exemptions. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree
+This test attempts to change the src of an IMG tag to all blocked ports to confirm that WebKit returns the correct error for them - blocked instead of cannot find. It also tries the FTP ports for exemptions. Due to the nature of this test, the results can only be processed automatically via DumpRenderTree
 
 

Modified: trunk/LayoutTests/security/block-test.html (271042 => 271043)


--- trunk/LayoutTests/security/block-test.html	2020-12-21 23:05:58 UTC (rev 271042)
+++ trunk/LayoutTests/security/block-test.html	2020-12-21 23:50:35 UTC (rev 271043)
@@ -77,7 +77,7 @@
     }
 </script>
 <body _onload_="makeImage()">
-<p>This test attempts to change the src of an IMG tag to all black listed ports to confirm that WebKit returns the
+<p>This test attempts to change the src of an IMG tag to all blocked ports to confirm that WebKit returns the
 correct error for them - blocked instead of cannot find.  It also tries the FTP ports for exemptions.  Due to the 
 nature of this test, the results can only be processed automatically via DumpRenderTree
 </p>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to