WebGPU: Remove GPUAdapter requestAdapterInfo() method
This CL removes the GPUAdapter requestAdapterInfo() method by turning
off the DeprecatedRequestAdapterInfo blink runtime feature.
Once it's stable enough, we'll clean it up entirely.
Spec PR: https://github.com/gpuweb/gpuweb/pull/4662
Intent to deprecate: https://groups.google.com/a/chromium.org/g/blink-dev/c/HxOgGf4NzQ4
Bug: 335383516
Change-Id: Ib6b85a9c8d3661992072028e25ba35798e7e6e4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5569679
Commit-Queue: Fr <beaufort.francois@gmail.com>
Reviewed-by: Richard (Torne) Coles <torne@chromium.org>
Reviewed-by: Yoav Weiss (@Shopify) <yoavweiss@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1364867}
diff --git a/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt b/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt
index 275edf6..704a882 100644
--- a/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt
+++ b/android_webview/tools/system_webview_shell/test/data/webexposed/global-interface-listing-expected.txt
@@ -2367,7 +2367,6 @@
getter isFallbackAdapter
getter limits
method constructor
- method requestAdapterInfo
method requestDevice
interface GPUAdapterInfo
attribute @@toStringTag
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
index 44add71b..6212215 100644
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -1330,10 +1330,10 @@
origin_trial_type: "deprecation",
},
{
- // This will allow us to remove the GPUAdapter requestAdapterInfo method
- // after the deprecation period. See https://crbug.com/335383516
+ // Remove this feature when the removal of the GPUAdapter
+ // requestAdapterInfo method has been stable long enough.
+ // See https://crbug.com/335383516
name: "DeprecatedRequestAdapterInfo",
- status: "stable",
},
// This allows pages to opt out of the unload deprecation. Enabling this
diff --git a/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt b/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
index e6f132de..c7ba6d7 100644
--- a/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
+++ b/third_party/blink/web_tests/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
@@ -716,7 +716,6 @@
getter isFallbackAdapter
getter limits
method constructor
- method requestAdapterInfo
method requestDevice
interface GPUAdapterInfo
attribute @@toStringTag
diff --git a/third_party/blink/web_tests/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt b/third_party/blink/web_tests/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
index cf07773..323dd73 100644
--- a/third_party/blink/web_tests/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
+++ b/third_party/blink/web_tests/virtual/stable/http/tests/serviceworker/webexposed/global-interface-listing-service-worker-expected.txt
@@ -599,7 +599,6 @@
getter isFallbackAdapter
getter limits
method constructor
- method requestAdapterInfo
method requestDevice
interface GPUAdapterInfo
attribute @@toStringTag
diff --git a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-dedicated-worker-expected.txt b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-dedicated-worker-expected.txt
index 08ab7d1..158e90918 100644
--- a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-dedicated-worker-expected.txt
+++ b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-dedicated-worker-expected.txt
@@ -611,7 +611,6 @@
[Worker] getter isFallbackAdapter
[Worker] getter limits
[Worker] method constructor
-[Worker] method requestAdapterInfo
[Worker] method requestDevice
[Worker] interface GPUAdapterInfo
[Worker] attribute @@toStringTag
diff --git a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
index 07696a6..ca11da5 100644
--- a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
+++ b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-expected.txt
@@ -2648,7 +2648,6 @@
getter isFallbackAdapter
getter limits
method constructor
- method requestAdapterInfo
method requestDevice
interface GPUAdapterInfo
attribute @@toStringTag
diff --git a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-shared-worker-expected.txt b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-shared-worker-expected.txt
index 1402cb5b..70454dd 100644
--- a/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-shared-worker-expected.txt
+++ b/third_party/blink/web_tests/virtual/stable/webexposed/global-interface-listing-shared-worker-expected.txt
@@ -540,7 +540,6 @@
[Worker] getter isFallbackAdapter
[Worker] getter limits
[Worker] method constructor
-[Worker] method requestAdapterInfo
[Worker] method requestDevice
[Worker] interface GPUAdapterInfo
[Worker] attribute @@toStringTag
diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt
index 2250564b..1329f8c 100644
--- a/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-dedicated-worker-expected.txt
@@ -737,7 +737,6 @@
[Worker] getter isFallbackAdapter
[Worker] getter limits
[Worker] method constructor
-[Worker] method requestAdapterInfo
[Worker] method requestDevice
[Worker] interface GPUAdapterInfo
[Worker] attribute @@toStringTag
diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt
index 80c4f7f8..37eeecd 100644
--- a/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-expected.txt
@@ -3040,7 +3040,6 @@
getter isFallbackAdapter
getter limits
method constructor
- method requestAdapterInfo
method requestDevice
interface GPUAdapterInfo
attribute @@toStringTag
diff --git a/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt b/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt
index aa127fb5..295f9db3 100644
--- a/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt
+++ b/third_party/blink/web_tests/webexposed/global-interface-listing-shared-worker-expected.txt
@@ -666,7 +666,6 @@
[Worker] getter isFallbackAdapter
[Worker] getter limits
[Worker] method constructor
-[Worker] method requestAdapterInfo
[Worker] method requestDevice
[Worker] interface GPUAdapterInfo
[Worker] attribute @@toStringTag
diff --git a/third_party/blink/web_tests/wpt_internal/webgpu/canvas_webgpu_transfer/webgpu-helpers.js b/third_party/blink/web_tests/wpt_internal/webgpu/canvas_webgpu_transfer/webgpu-helpers.js
index dff22fa..f4ae2a9 100644
--- a/third_party/blink/web_tests/wpt_internal/webgpu/canvas_webgpu_transfer/webgpu-helpers.js
+++ b/third_party/blink/web_tests/wpt_internal/webgpu/canvas_webgpu_transfer/webgpu-helpers.js
@@ -8,18 +8,12 @@
assert_unreached('Failed to request WebGPU adapter.');
return;
}
- return adapter.requestAdapterInfo().then((adapterInfo) => {
- if (!(adapterInfo instanceof GPUAdapterInfo)) {
- assert_unreached('Failed to request WebGPU adapter info.');
+ return adapter.requestDevice().then((device) => {
+ if (!(device instanceof GPUDevice)) {
+ assert_unreached('Failed to request WebGPU device.');
return;
}
- return adapter.requestDevice().then((device) => {
- if (!(device instanceof GPUDevice)) {
- assert_unreached('Failed to request WebGPU device.');
- return;
- }
- return callback(adapter, adapterInfo, device);
- });
+ return callback(adapter, adapter.info, device);
});
});
}
