Title: [269176] trunk
Revision
269176
Author
[email protected]
Date
2020-10-29 18:17:30 -0700 (Thu, 29 Oct 2020)

Log Message

Remove all remaining boolean overridePreference calls
https://bugs.webkit.org/show_bug.cgi?id=218355

Reviewed by Darin Adler.
Tools:

Add a few more defaults for DumpRenderTree to allow them to be
used as test header commands.

* DumpRenderTree/TestOptions.cpp:
(WTR::TestOptions::defaults):

LayoutTests:

Remove unnecessary testRunner.overridePreference calls (for features on
by default) and replace others with test header commands or internals.settings
as appropriate.

* fast/canvas/webgl/resources/js-test-pre.js:
* fast/dom/timer-throttling-hidden-page-non-nested.html:
* fast/dom/timer-throttling-hidden-page.html:
* fast/events/resources/tabindex-focus-blur-all.js:
* fast/harness/override-preferences-2-expected.txt: Removed.
* fast/harness/override-preferences-2.html: Removed.
* fast/harness/override-preferences-expected.txt: Removed.
* fast/harness/override-preferences.html: Removed.
* fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html:
* fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place.html:
* fast/mediacapturefromelement/resources/webgl-test.js:
* fast/parser/noscript-with-_javascript_-disabled.html:
* fast/parser/noscript-with-_javascript_-enabled.html:
* http/tests/cache/display-image-unset-allows-cached-image-load.html:
* http/tests/misc/favicon-loads-with-icon-loading-override.html:
* http/tests/misc/favicon-loads-with-images-disabled.html:
* http/tests/xsl/xslt-transform-with-_javascript_-disabled.html:
* media/remove-video-best-media-element-in-main-frame-crash.html:
* platform/mac-wk2/plugins/asychronous-deadlock-with-timer-and-evaluate.html:
* platform/mac-wk2/plugins/asynchronous-destroy-before-initialization.html:
* platform/mac-wk2/plugins/destroy-during-async-npp-new.html:
* platform/mac-wk2/plugins/script-object-access-fails-during-slow-initialization.html:
* platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization-multiple.html:
* platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization.html:
* svg/as-image/svg-image-with-data-uri-images-disabled.html:
* webaudio/resources/audio-testing.js:
* webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js:
* webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js:
* webgl/2.0.0/resources/webgl_test_files/conformance/more/unit.js:
* webgl/2.0.0/resources/webgl_test_files/js/js-test-pre.js:
* webgl/resources/js-test-pre.js:
* webgl/resources/webgl_test_files/js/js-test-pre.js:

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (269175 => 269176)


--- trunk/LayoutTests/ChangeLog	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/ChangeLog	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,3 +1,47 @@
+2020-10-29  Sam Weinig  <[email protected]>
+
+        Remove all remaining boolean overridePreference calls
+        https://bugs.webkit.org/show_bug.cgi?id=218355
+
+        Reviewed by Darin Adler.
+
+        Remove unnecessary testRunner.overridePreference calls (for features on
+        by default) and replace others with test header commands or internals.settings
+        as appropriate. 
+
+        * fast/canvas/webgl/resources/js-test-pre.js:
+        * fast/dom/timer-throttling-hidden-page-non-nested.html:
+        * fast/dom/timer-throttling-hidden-page.html:
+        * fast/events/resources/tabindex-focus-blur-all.js:
+        * fast/harness/override-preferences-2-expected.txt: Removed.
+        * fast/harness/override-preferences-2.html: Removed.
+        * fast/harness/override-preferences-expected.txt: Removed.
+        * fast/harness/override-preferences.html: Removed.
+        * fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html:
+        * fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place.html:
+        * fast/mediacapturefromelement/resources/webgl-test.js:
+        * fast/parser/noscript-with-_javascript_-disabled.html:
+        * fast/parser/noscript-with-_javascript_-enabled.html:
+        * http/tests/cache/display-image-unset-allows-cached-image-load.html:
+        * http/tests/misc/favicon-loads-with-icon-loading-override.html:
+        * http/tests/misc/favicon-loads-with-images-disabled.html:
+        * http/tests/xsl/xslt-transform-with-_javascript_-disabled.html:
+        * media/remove-video-best-media-element-in-main-frame-crash.html:
+        * platform/mac-wk2/plugins/asychronous-deadlock-with-timer-and-evaluate.html:
+        * platform/mac-wk2/plugins/asynchronous-destroy-before-initialization.html:
+        * platform/mac-wk2/plugins/destroy-during-async-npp-new.html:
+        * platform/mac-wk2/plugins/script-object-access-fails-during-slow-initialization.html:
+        * platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization-multiple.html:
+        * platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization.html:
+        * svg/as-image/svg-image-with-data-uri-images-disabled.html:
+        * webaudio/resources/audio-testing.js:
+        * webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js:
+        * webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js:
+        * webgl/2.0.0/resources/webgl_test_files/conformance/more/unit.js:
+        * webgl/2.0.0/resources/webgl_test_files/js/js-test-pre.js:
+        * webgl/resources/js-test-pre.js:
+        * webgl/resources/webgl_test_files/js/js-test-pre.js:
+
 2020-10-29  Karl Rackler  <[email protected]>
 
         REGRESSION (r269070): [ Big Sur ] editing/input/reveal-caret-of-multiline-input.html is a constant failure

Modified: trunk/LayoutTests/fast/canvas/webgl/resources/js-test-pre.js (269175 => 269176)


--- trunk/LayoutTests/fast/canvas/webgl/resources/js-test-pre.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/canvas/webgl/resources/js-test-pre.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -38,7 +38,6 @@
     }
 
     if (window.layoutTestController) {
-      window.layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
       window.layoutTestController.dumpAsText();
       window.layoutTestController.waitUntilDone();
     }

Modified: trunk/LayoutTests/fast/dom/timer-throttling-hidden-page-non-nested.html (269175 => 269176)


--- trunk/LayoutTests/fast/dom/timer-throttling-hidden-page-non-nested.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/dom/timer-throttling-hidden-page-non-nested.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,4 +1,4 @@
-<html>
+<html><!-- webkit-test-runner [ HiddenPageDOMTimerThrottlingEnabled=true ] -->
 <head>
     <script src=""
     <script>
@@ -35,7 +35,6 @@
                 debug('This test requires testRunner');
                 return;
             }
-            testRunner.overridePreference("WebKitHiddenPageDOMTimerThrottlingEnabled", 1);
 
             timerHandle = setTimeout(testTimer, timeoutInterval);
             shouldBeFalse("internals.isTimerThrottled(timerHandle)");

Modified: trunk/LayoutTests/fast/dom/timer-throttling-hidden-page.html (269175 => 269176)


--- trunk/LayoutTests/fast/dom/timer-throttling-hidden-page.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/dom/timer-throttling-hidden-page.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,4 +1,4 @@
-<html>
+<html><!-- webkit-test-runner [ HiddenPageDOMTimerThrottlingEnabled=true ] -->
 <body>
     <script src=""
     <script>
@@ -31,7 +31,6 @@
                 debug('This test requires testRunner');
                 return;
             }
-            testRunner.overridePreference("WebKitHiddenPageDOMTimerThrottlingEnabled", 1);
 
             timerHandle = setTimeout(testTimer, timeoutInterval);
             shouldBeFalse("internals.isTimerThrottled(timerHandle)");

Modified: trunk/LayoutTests/fast/events/resources/tabindex-focus-blur-all.js (269175 => 269176)


--- trunk/LayoutTests/fast/events/resources/tabindex-focus-blur-all.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/events/resources/tabindex-focus-blur-all.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,5 +1,4 @@
 if (window.testRunner) {
-    testRunner.overridePreference("WebKitJavaEnabled", "0");
     testRunner.waitUntilDone();
     testRunner.dumpAsText();
 }

Deleted: trunk/LayoutTests/fast/harness/override-preferences-2-expected.txt (269175 => 269176)


--- trunk/LayoutTests/fast/harness/override-preferences-2-expected.txt	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/harness/override-preferences-2-expected.txt	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,3 +0,0 @@
-This test verifies that testRunner can have its default preferences overriden. This test verifies that the API will accept string values and also override the default font size. You should see "PASS" below.
-
-PASS

Deleted: trunk/LayoutTests/fast/harness/override-preferences-2.html (269175 => 269176)


--- trunk/LayoutTests/fast/harness/override-preferences-2.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/harness/override-preferences-2.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,18 +0,0 @@
-<html>
-<script>
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.overridePreference("WebKitDefaultFontSize", "24");
-    }
-</script>
-<body>
-    <p>This test verifies that testRunner can have its default preferences overriden.
-    This test verifies that the API will accept string values and also override the default font size.
-    You should see "PASS" below.</p>
-    <script>
-        var p = document.getElementsByTagName("p")[0];
-        if (!window.testRunner || window.getComputedStyle(p).fontSize == "24px")
-            document.write("PASS");
-    </script>
-</body>
-</html>

Deleted: trunk/LayoutTests/fast/harness/override-preferences-expected.txt (269175 => 269176)


--- trunk/LayoutTests/fast/harness/override-preferences-expected.txt	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/harness/override-preferences-expected.txt	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,3 +0,0 @@
-This is a test that verifies that testRunner can have its default preferences overridden. This test specifically checks that _javascript_ can be disabled, and you should see "PASS" below if viewing with a browser.
-
-PASS

Deleted: trunk/LayoutTests/fast/harness/override-preferences.html (269175 => 269176)


--- trunk/LayoutTests/fast/harness/override-preferences.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/harness/override-preferences.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,18 +0,0 @@
-<html>
-<body>
-<script>
-    if (window.testRunner) {
-        testRunner.dumpAsText()
-        testRunner.overridePreference("WebKitJavaScriptEnabled", false);
-    }
-
-    function loadstatus() {
-        if (window.testRunner)
-            document.getElementById("status").innerHTML = "FAIL";
-    }
-</script>
-<body _onload_="loadstatus()">
-    <p>This is a test that verifies that testRunner can have its default preferences overridden.  This test specifically checks that _javascript_ can be disabled, and you should see "PASS" below if viewing with a browser.</p>
-    <span id="status">PASS</span>
-</body>
-</html>

Modified: trunk/LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html (269175 => 269176)


--- trunk/LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,7 +1,7 @@
 <html>
 <head>
 <script>
-// Setting WebKitDisplayImagesKey is asynchronous, so using queueReload and setInterval to check when the setting actually take effect.
+// Setting loadsImagesAutomatically is asynchronous, so using queueReload and setInterval to check when the setting actually take effect.
 
 var intervalId;
 var imageOnloadFired = 0;
@@ -9,7 +9,7 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     window.internals.settings.setImagesEnabled(true);
-    testRunner.overridePreference('WebKitDisplayImagesKey', 0);
+    window.internals.settings.setLoadsImagesAutomatically(false);
     testRunner.queueReload();
 }
 
@@ -17,12 +17,12 @@
 {
     var image = document.getElementById('image');
     if (image.naturalHeight != 0 || image.naturalWidth != 0 || imageOnloadFired != 0) {
-        document.getElementById('result').innerHTML = 'FAILURE: Image should not be loaded when DisplayImage is unset';
+        document.getElementById('result').innerHTML = 'FAILURE: Image should not be loaded when loadsImagesAutomatically is unset';
         return;
     }
 
-    testRunner.overridePreference('WebKitDisplayImagesKey', 1);
-    document.getElementById('result').innerHTML = 'FAILURE: Image should reload in-place when DispalyImage is changes from unset to set';
+    window.internals.settings.setLoadsImagesAutomatically(true);
+    document.getElementById('result').innerHTML = 'FAILURE: Image should reload in-place when loadsImagesAutomatically is changes from unset to set';
     testRunner.waitUntilDone();
     intervalId = window.setInterval(runTestRest, 10);
 }

Modified: trunk/LayoutTests/fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place.html (269175 => 269176)


--- trunk/LayoutTests/fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -8,7 +8,6 @@
 
 if (window.testRunner) {
     testRunner.dumpAsText();
-    testRunner.overridePreference('WebKitDisplayImagesKey', 1);
     window.internals.settings.setImagesEnabled(false);
     testRunner.queueReload();
 }

Modified: trunk/LayoutTests/fast/mediacapturefromelement/resources/webgl-test.js (269175 => 269176)


--- trunk/LayoutTests/fast/mediacapturefromelement/resources/webgl-test.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/mediacapturefromelement/resources/webgl-test.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,7 +1,5 @@
 //----------------------------------------------------------------------
 // Differences with respect to Khronos version of webgl-test.js
-if (window.testRunner)
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
 
 function assertMsg(assertion, msg) {
     if (assertion) {
@@ -13,7 +11,6 @@
 
 function initNonKhronosFramework(waitUntilDone) {
   if (window.testRunner) {
-    testRunner.overridePreference("WebKitWebGLEnabled", "1");
     testRunner.dumpAsText();
     if (waitUntilDone) {
       window.jsTestIsAsync = true;

Modified: trunk/LayoutTests/fast/parser/noscript-with-_javascript_-disabled.html (269175 => 269176)


--- trunk/LayoutTests/fast/parser/noscript-with-_javascript_-disabled.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/parser/noscript-with-_javascript_-disabled.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -4,7 +4,7 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.dumpChildFramesAsText();
-    testRunner.overridePreference("WebKitJavaScriptEnabled", false);
+    window.internals.settings.setScriptEnabled(false);
 }
 </script>
 

Modified: trunk/LayoutTests/fast/parser/noscript-with-_javascript_-enabled.html (269175 => 269176)


--- trunk/LayoutTests/fast/parser/noscript-with-_javascript_-enabled.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/fast/parser/noscript-with-_javascript_-enabled.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -3,7 +3,6 @@
 <script>
 if (window.testRunner) {
     testRunner.dumpAsText();
-    testRunner.overridePreference("WebKitJavaScriptEnabled", true);
 }
 </script>
 

Modified: trunk/LayoutTests/http/tests/cache/display-image-unset-allows-cached-image-load.html (269175 => 269176)


--- trunk/LayoutTests/http/tests/cache/display-image-unset-allows-cached-image-load.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/http/tests/cache/display-image-unset-allows-cached-image-load.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -3,7 +3,7 @@
 <head>
 <script>
 // Opens two windows containing the same image. First window will populate the cache with
-// image. The second window is opened with WebKitDisplayImagesKey unset, but image should
+// image. The second window is opened with loadsImagesAutomatically unset, but image should
 // still load since it is in cache.
 function runTest()
 {
@@ -19,7 +19,7 @@
 
 function image1Loaded()
 {
-    testRunner.overridePreference('WebKitDisplayImagesKey', 0);
+    window.internals.settings.setLoadsImagesAutomatically(false);
     document.getElementById('result').innerHTML = 'FAILURE: image2.html not loaded';
     window.setTimeout(function() {window.open("resources/image2.html", "_blank");}, 0);
 }

Modified: trunk/LayoutTests/http/tests/misc/favicon-loads-with-icon-loading-override.html (269175 => 269176)


--- trunk/LayoutTests/http/tests/misc/favicon-loads-with-icon-loading-override.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/http/tests/misc/favicon-loads-with-icon-loading-override.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,4 +1,4 @@
-<html>
+<html><!-- webkit-test-runner [ LoadsImagesAutomatically=false ] -->
 <head>
 <script>
 function runTest()
@@ -7,7 +7,6 @@
         testRunner.dumpAsText();
         testRunner.dumpResourceLoadCallbacks();
         testRunner.setIconDatabaseEnabled(true);
-        testRunner.overridePreference("WebKitDisplayImagesKey", 0);
         internals.setLoadsSiteIconsIgnoringImageLoadingSetting(true);
         testRunner.queueReload();
     }

Modified: trunk/LayoutTests/http/tests/misc/favicon-loads-with-images-disabled.html (269175 => 269176)


--- trunk/LayoutTests/http/tests/misc/favicon-loads-with-images-disabled.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/http/tests/misc/favicon-loads-with-images-disabled.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,4 +1,4 @@
-<html>
+<html><!-- webkit-test-runner [ LoadsImagesAutomatically=false ] -->
 <head>
 <script>
 function runTest()

Modified: trunk/LayoutTests/http/tests/xsl/xslt-transform-with-_javascript_-disabled.html (269175 => 269176)


--- trunk/LayoutTests/http/tests/xsl/xslt-transform-with-_javascript_-disabled.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/http/tests/xsl/xslt-transform-with-_javascript_-disabled.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -4,7 +4,7 @@
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.dumpChildFramesAsText();
-    testRunner.overridePreference("WebKitJavaScriptEnabled", false);
+    window.internals.settings.setScriptEnabled(false);
 }
 
 function shouldNotBeExecuted()

Modified: trunk/LayoutTests/media/remove-video-best-media-element-in-main-frame-crash.html (269175 => 269176)


--- trunk/LayoutTests/media/remove-video-best-media-element-in-main-frame-crash.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/media/remove-video-best-media-element-in-main-frame-crash.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html><!-- webkit-test-runner [ MainContentUserGestureOverrideEnabled=true ] -->
 <html>
 <body>
 <p id="description">This tests removing a video element inside an iframe while another video in the main frame is playing does not hit a release assertion.</p>
@@ -26,7 +26,6 @@
 }
 
 if (window.internals) {
-    testRunner.overridePreference("WebKitMainContentUserGestureOverrideEnabled", 1);
     internals.setMediaElementRestrictions(video, "OverrideUserGestureRequirementForMainContent");
 } else
     description.innerHTML += '<br>This test requries OverrideUserGestureRequirementForMainContent. Manually set this setting or use WebKitTestRunner.';

Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (269175 => 269176)


--- trunk/LayoutTests/platform/ios-wk2/TestExpectations	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations	2020-10-30 01:17:30 UTC (rev 269176)
@@ -435,7 +435,6 @@
 fast/frames/frame-with-noresize-can-be-resized-after-removal-of-noresize.html [ Failure ]
 fast/frames/frame-with-noresize-can-be-resized-after-setting-noResize-to-false.html [ Failure ]
 fast/frames/location-redirect-user-gesture.html [ Failure ]
-fast/harness/override-preferences-2.html [ Failure ]
 fast/selectors/querySelector-window-inactive.html [ Failure ]
 fast/spatial-navigation/snav-only-clipped-overflow-content.html [ Failure ]
 fast/spatial-navigation/snav-z-index.html [ Failure ]

Modified: trunk/LayoutTests/platform/mac-wk2/plugins/asychronous-deadlock-with-timer-and-evaluate.html (269175 => 269176)


--- trunk/LayoutTests/platform/mac-wk2/plugins/asychronous-deadlock-with-timer-and-evaluate.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/asychronous-deadlock-with-timer-and-evaluate.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,9 +1,7 @@
-<head>
+<head><!-- webkit-test-runner [ AsynchronousPluginInitializationEnabled=true AsynchronousPluginInitializationEnabledForAllPlugins=true ] -->
 <script src=""
 <script>
 if (window.testRunner) {
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabled", "1");
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabledForAllPlugins", "1");
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
 }

Modified: trunk/LayoutTests/platform/mac-wk2/plugins/asynchronous-destroy-before-initialization.html (269175 => 269176)


--- trunk/LayoutTests/platform/mac-wk2/plugins/asynchronous-destroy-before-initialization.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/asynchronous-destroy-before-initialization.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,4 +1,4 @@
-<head>
+<head><!-- webkit-test-runner [ AsynchronousPluginInitializationEnabled=true AsynchronousPluginInitializationEnabledForAllPlugins=true ] -->
 <script src=""
 <script>
 
@@ -5,8 +5,6 @@
 var startTime = new Date;
 
 if (window.testRunner) {
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabled", "1");
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabledForAllPlugins", "1");
     window.internals.settings.setCanStartMedia(false);
     testRunner.dumpAsText();
     testRunner.waitUntilDone();

Modified: trunk/LayoutTests/platform/mac-wk2/plugins/destroy-during-async-npp-new.html (269175 => 269176)


--- trunk/LayoutTests/platform/mac-wk2/plugins/destroy-during-async-npp-new.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/destroy-during-async-npp-new.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,9 +1,7 @@
-<head>
+<head><!-- webkit-test-runner [ AsynchronousPluginInitializationEnabled=true AsynchronousPluginInitializationEnabledForAllPlugins=true ] -->
 <script src=""
 <script>
 if (window.testRunner) {
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabled", "1");
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabledForAllPlugins", "1");
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
 }

Modified: trunk/LayoutTests/platform/mac-wk2/plugins/script-object-access-fails-during-slow-initialization.html (269175 => 269176)


--- trunk/LayoutTests/platform/mac-wk2/plugins/script-object-access-fails-during-slow-initialization.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/script-object-access-fails-during-slow-initialization.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,4 +1,4 @@
-<head>
+<head><!-- webkit-test-runner [ AsynchronousPluginInitializationEnabled=true AsynchronousPluginInitializationEnabledForAllPlugins=true ] -->
 <script src=""
 <script>
 
@@ -5,8 +5,6 @@
 var startTime = new Date;
 
 if (window.testRunner) {
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabled", "1");
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabledForAllPlugins", "1");
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
 }

Modified: trunk/LayoutTests/platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization-multiple.html (269175 => 269176)


--- trunk/LayoutTests/platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization-multiple.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization-multiple.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,4 +1,4 @@
-<head>
+<head><!-- webkit-test-runner [ AsynchronousPluginInitializationEnabled=true AsynchronousPluginInitializationEnabledForAllPlugins=true ] -->
 <script src=""
 </head>
 <body _onload_="runTest()">
@@ -24,8 +24,6 @@
 
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabled", "1");
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabledForAllPlugins", "1");
 
     // Grab the time before we create and append 20 slow plug-ins.
     sessionStorage.beforeDate = (new Date).valueOf();

Modified: trunk/LayoutTests/platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization.html (269175 => 269176)


--- trunk/LayoutTests/platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/platform/mac-wk2/plugins/slow/asynchronous-plugin-initialization.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,4 +1,4 @@
-<head>
+<head><!-- webkit-test-runner [ AsynchronousPluginInitializationEnabled=true AsynchronousPluginInitializationEnabledForAllPlugins=true ] -->
 <script src=""
 </head>
 <body _onload_="runTest()">
@@ -24,8 +24,6 @@
 
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabled", "1");
-    testRunner.overridePreference("WebKit2AsynchronousPluginInitializationEnabledForAllPlugins", "1");
 
     var beforeDate = new Date;
     

Modified: trunk/LayoutTests/platform/wk2/TestExpectations (269175 => 269176)


--- trunk/LayoutTests/platform/wk2/TestExpectations	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/platform/wk2/TestExpectations	2020-10-30 01:17:30 UTC (rev 269176)
@@ -59,7 +59,6 @@
 
 # WebKitTestRunner needs overridePreference for non-boolean values
 # (zero-font-size.html passes because overridePreference does not work)
-webkit.org/b/42197 fast/harness/override-preferences-2.html [ Failure ]
 webkit.org/b/42197 fast/text/zero-font-size.html [ Pass ]
 
 webkit.org/b/82665 http/tests/webarchive/test-css-url-encoding.html [ Skip ]

Modified: trunk/LayoutTests/svg/as-image/svg-image-with-data-uri-images-disabled.html (269175 => 269176)


--- trunk/LayoutTests/svg/as-image/svg-image-with-data-uri-images-disabled.html	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/svg/as-image/svg-image-with-data-uri-images-disabled.html	2020-10-30 01:17:30 UTC (rev 269176)
@@ -11,7 +11,7 @@
   <script>
     if (window.testRunner) {
       window.internals.settings.setImagesEnabled(false);
-      testRunner.overridePreference('WebKitDisplayImagesKey', 0);
+      window.internals.settings.setLoadsImagesAutomatically(false);
       testRunner.queueReload();
     }
   </script>

Modified: trunk/LayoutTests/webaudio/resources/audio-testing.js (269175 => 269176)


--- trunk/LayoutTests/webaudio/resources/audio-testing.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/webaudio/resources/audio-testing.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,6 +1,3 @@
-if (window.testRunner)
-    testRunner.overridePreference("WebKitWebAudioEnabled", "1");
-
 function writeString(s, a, offset) {
     for (var i = 0; i < s.length; ++i) {
         a[offset + i] = s.charCodeAt(i);

Modified: trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js (269175 => 269176)


--- trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/conformance/more/unit.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -33,7 +33,6 @@
 }
 
 if (window.layoutTestController) {
-  layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
   layoutTestController.dumpAsText();
   layoutTestController.waitUntilDone();
 

Modified: trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js (269175 => 269176)


--- trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/webgl/1.0.3/resources/webgl_test_files/resources/js-test-pre.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -38,7 +38,6 @@
     }
 
     if (window.layoutTestController) {
-      layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
       layoutTestController.dumpAsText();
       layoutTestController.waitUntilDone();
     }

Modified: trunk/LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance/more/unit.js (269175 => 269176)


--- trunk/LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance/more/unit.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/webgl/2.0.0/resources/webgl_test_files/conformance/more/unit.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -33,7 +33,6 @@
 }
 
 if (window.layoutTestController) {
-  layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
   layoutTestController.dumpAsText();
   layoutTestController.waitUntilDone();
 

Modified: trunk/LayoutTests/webgl/2.0.0/resources/webgl_test_files/js/js-test-pre.js (269175 => 269176)


--- trunk/LayoutTests/webgl/2.0.0/resources/webgl_test_files/js/js-test-pre.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/webgl/2.0.0/resources/webgl_test_files/js/js-test-pre.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -38,7 +38,6 @@
     }
 
     if (window.layoutTestController) {
-      window.layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
       window.layoutTestController.dumpAsText();
       window.layoutTestController.waitUntilDone();
     }

Modified: trunk/LayoutTests/webgl/resources/js-test-pre.js (269175 => 269176)


--- trunk/LayoutTests/webgl/resources/js-test-pre.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/webgl/resources/js-test-pre.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -38,7 +38,6 @@
     }
 
     if (window.layoutTestController) {
-      layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
       layoutTestController.dumpAsText();
       layoutTestController.waitUntilDone();
     }

Modified: trunk/LayoutTests/webgl/resources/webgl_test_files/js/js-test-pre.js (269175 => 269176)


--- trunk/LayoutTests/webgl/resources/webgl_test_files/js/js-test-pre.js	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/LayoutTests/webgl/resources/webgl_test_files/js/js-test-pre.js	2020-10-30 01:17:30 UTC (rev 269176)
@@ -21,7 +21,6 @@
     }
 
     if (window.layoutTestController) {
-      window.layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
       window.layoutTestController.dumpAsText();
       window.layoutTestController.waitUntilDone();
     }

Modified: trunk/Tools/ChangeLog (269175 => 269176)


--- trunk/Tools/ChangeLog	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/Tools/ChangeLog	2020-10-30 01:17:30 UTC (rev 269176)
@@ -1,3 +1,16 @@
+2020-10-29  Sam Weinig  <[email protected]>
+
+        Remove all remaining boolean overridePreference calls
+        https://bugs.webkit.org/show_bug.cgi?id=218355
+
+        Reviewed by Darin Adler.
+        
+        Add a few more defaults for DumpRenderTree to allow them to be
+        used as test header commands.
+
+        * DumpRenderTree/TestOptions.cpp:
+        (WTR::TestOptions::defaults):
+
 2020-10-29  Aditya Keerthi  <[email protected]>
 
         [Cocoa] Remove soft linking of NetworkExtension.framework

Modified: trunk/Tools/DumpRenderTree/TestOptions.cpp (269175 => 269176)


--- trunk/Tools/DumpRenderTree/TestOptions.cpp	2020-10-30 00:55:16 UTC (rev 269175)
+++ trunk/Tools/DumpRenderTree/TestOptions.cpp	2020-10-30 01:17:30 UTC (rev 269176)
@@ -51,19 +51,23 @@
         features.boolWebPreferenceFeatures = {
             // These are WebPreference values that must always be set as they may
             // differ from the default set in the WebPreferences*.yaml configuration.
+            { "AcceleratedDrawingEnabled", false },
             { "AllowCrossOriginSubresourcesToAskForCredentials", false },
             { "AllowTopNavigationToDataURLs", true },
-            { "AcceleratedDrawingEnabled", false },
             { "AttachmentElementEnabled", false },
-            { "UsesBackForwardCache", false },
             { "ColorFilterEnabled", false },
+            { "HiddenPageDOMTimerThrottlingEnabled", false },
             { "InspectorAdditionsEnabled", false },
             { "IntersectionObserverEnabled", false },
+            { "_javascript_Enabled", true },
             { "KeygenElementEnabled", false },
+            { "LoadsImagesAutomatically", true },
+            { "MainContentUserGestureOverrideEnabled", false },
             { "MenuItemElementEnabled", false },
             { "ModernMediaControlsEnabled", true },
             { "SpatialNavigationEnabled", false },
             { "TabsToLinks", false },
+            { "UsesBackForwardCache", false },
 
             { "CSSLogicalEnabled", false },
             { "LineHeightUnitsEnabled", false },
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to