Diff
Modified: trunk/LayoutTests/ChangeLog (292787 => 292788)
--- trunk/LayoutTests/ChangeLog 2022-04-12 22:13:47 UTC (rev 292787)
+++ trunk/LayoutTests/ChangeLog 2022-04-12 22:30:37 UTC (rev 292788)
@@ -1,3 +1,13 @@
+2022-04-12 Myles C. Maxfield <[email protected]>
+
+ [WKTR] [DRT] Only enable WebGPU for the LayoutTests/http/tests/webgpu directory
+ https://bugs.webkit.org/show_bug.cgi?id=238779
+
+ Reviewed by Darin Adler.
+
+ * platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt:
+ * platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt:
+
2022-04-12 Karl Rackler <[email protected]>
[ BigSur+ wk2 Release ] css3/masking/reference-clip-path-animate-transform-repaint.html is a flaky failure
Modified: trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt (292787 => 292788)
--- trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt 2022-04-12 22:13:47 UTC (rev 292787)
+++ trunk/LayoutTests/platform/mac-wk1/fast/dom/navigator-detached-no-crash-expected.txt 2022-04-12 22:30:37 UTC (rev 292788)
@@ -5,7 +5,6 @@
navigator.appVersion is OK
navigator.cookieEnabled is OK
navigator.getStorageUpdates() is OK
-navigator.gpu is OK
navigator.hardwareConcurrency is OK
navigator.javaEnabled() is OK
navigator.language is OK
@@ -33,7 +32,6 @@
navigator.appVersion is OK
navigator.cookieEnabled is OK
navigator.getStorageUpdates() is OK
-navigator.gpu is OK
navigator.hardwareConcurrency is OK
navigator.javaEnabled() is OK
navigator.language is OK
Modified: trunk/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt (292787 => 292788)
--- trunk/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt 2022-04-12 22:13:47 UTC (rev 292787)
+++ trunk/LayoutTests/platform/mac-wk2/fast/dom/navigator-detached-no-crash-expected.txt 2022-04-12 22:30:37 UTC (rev 292788)
@@ -9,7 +9,6 @@
navigator.cookieEnabled is OK
navigator.credentials is OK
navigator.getStorageUpdates() is OK
-navigator.gpu is OK
navigator.hardwareConcurrency is OK
navigator.isLoggedIn() is OK
navigator.javaEnabled() is OK
@@ -47,7 +46,6 @@
navigator.cookieEnabled is OK
navigator.credentials is OK
navigator.getStorageUpdates() is OK
-navigator.gpu is OK
navigator.hardwareConcurrency is OK
navigator.isLoggedIn() is OK
navigator.javaEnabled() is OK
Modified: trunk/Tools/ChangeLog (292787 => 292788)
--- trunk/Tools/ChangeLog 2022-04-12 22:13:47 UTC (rev 292787)
+++ trunk/Tools/ChangeLog 2022-04-12 22:30:37 UTC (rev 292788)
@@ -1,3 +1,21 @@
+2022-04-12 Myles C. Maxfield <[email protected]>
+
+ [WKTR] [DRT] Only enable WebGPU for the LayoutTests/http/tests/webgpu directory
+ https://bugs.webkit.org/show_bug.cgi?id=238779
+
+ Reviewed by Darin Adler.
+
+ We have a set of hardcoded directories already; this adds to that.
+ WebGPU is only ready for LayoutTests to use; it isn't ready for any other WKTR/DRT usage.
+
+ * DumpRenderTree/TestOptions.cpp:
+ (WTR::TestOptions::defaults):
+ * TestRunnerShared/TestFeatures.cpp:
+ (WTR::shouldEnableWebGPU):
+ (WTR::hardcodedFeaturesBasedOnPathForTest):
+ * WebKitTestRunner/TestOptions.cpp:
+ (WTR::TestOptions::defaults):
+
2022-04-12 Jonathan Bedard <[email protected]>
[Merge-Queue] Prioritize oldest builds first
Modified: trunk/Tools/DumpRenderTree/TestOptions.cpp (292787 => 292788)
--- trunk/Tools/DumpRenderTree/TestOptions.cpp 2022-04-12 22:13:47 UTC (rev 292787)
+++ trunk/Tools/DumpRenderTree/TestOptions.cpp 2022-04-12 22:30:37 UTC (rev 292788)
@@ -101,7 +101,6 @@
{ "TextAutosizingEnabled", false },
{ "UsesBackForwardCache", false },
{ "WebAudioEnabled", true },
- { "WebGPU", true },
{ "WebSQLEnabled", true },
{ "XSSAuditorEnabled", false },
@@ -119,7 +118,6 @@
{ "LazyImageLoadingEnabled", false },
{ "RequestIdleCallbackEnabled", false },
{ "WebAuthenticationEnabled", false },
- { "WebGPUEnabled", false },
#elif PLATFORM(WIN)
// These are WebPreference values that must always be set as they may
// differ from the default set in the WebPreferences*.yaml configuration.
@@ -172,7 +170,6 @@
{ "TabsToLinks", false },
{ "TelephoneNumberParsingEnabled", false },
{ "UsesBackForwardCache", false },
- { "WebGPUEnabled", false },
{ "XSSAuditorEnabled", false },
#endif
#if ENABLE(GPU_PROCESS) && ENABLE(WEBGL)
Modified: trunk/Tools/TestRunnerShared/TestFeatures.cpp (292787 => 292788)
--- trunk/Tools/TestRunnerShared/TestFeatures.cpp 2022-04-12 22:13:47 UTC (rev 292787)
+++ trunk/Tools/TestRunnerShared/TestFeatures.cpp 2022-04-12 22:30:37 UTC (rev 292788)
@@ -122,6 +122,11 @@
|| pathContains(pathOrURL, "localhost:8800/websockets") || pathContains(pathOrURL, "localhost:9443/websockets");
}
+static bool shouldEnableWebGPU(const std::string& pathOrURL)
+{
+ return pathContains(pathOrURL, "127.0.0.1:8000/webgpu");
+}
+
TestFeatures hardcodedFeaturesBasedOnPathForTest(const TestCommand& command)
{
TestFeatures features;
@@ -138,6 +143,8 @@
features.doubleTestRunnerFeatures.insert({ "viewWidth", viewWidthAndHeight->first });
features.doubleTestRunnerFeatures.insert({ "viewHeight", viewWidthAndHeight->second });
}
+ if (shouldEnableWebGPU(command.pathOrURL))
+ features.boolWebPreferenceFeatures.insert({ "WebGPU", true });
return features;
}
Modified: trunk/Tools/WebKitTestRunner/TestOptions.cpp (292787 => 292788)
--- trunk/Tools/WebKitTestRunner/TestOptions.cpp 2022-04-12 22:13:47 UTC (rev 292787)
+++ trunk/Tools/WebKitTestRunner/TestOptions.cpp 2022-04-12 22:30:37 UTC (rev 292788)
@@ -125,7 +125,6 @@
{ "TextAutosizingUsesIdempotentMode", false },
{ "UsesBackForwardCache", false },
{ "WebAuthenticationEnabled", true },
- { "WebGPU", true },
{ "WebRTCRemoteVideoFrameEnabled", true },
{ "WebRTCMDNSICECandidatesEnabled", false },
{ "XSSAuditorEnabled", false },
