webgpu: Validate featureLevel is an allowed feature level string value

beaufortfrancois · Chromium LUCI CQ · commit d00996faacd9 · 2024-12-05T20:34:47.000Z
Spec PR: gpuweb/gpuweb#4897 CTS PR: gpuweb/cts#4077 Bug: 366151404 Change-Id: I451a5e66f85468cb433b9f20edf7c09644ac8cd7 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6067690 Reviewed-by: Kai Ninomiya <kainino@chromium.org> Commit-Queue: Kai Ninomiya <kainino@chromium.org> Cr-Commit-Position: refs/heads/main@{#1392500}
diff --git a/third_party/blink/renderer/modules/webgpu/gpu.cc b/third_party/blink/renderer/modules/webgpu/gpu.cc
@@ -280,9 +280,11 @@ void GPU::RequestAdapterImpl(
     ScriptPromiseResolver<IDLNullable<GPUAdapter>>* resolver) {
   ExecutionContext* execution_context = ExecutionContext::From(script_state);
 
-  // Validate that the featureLevel is undefined. If not return a null adapter.
-  // This logic will evolve as feature levels are added in the future.
-  if (options->hasFeatureLevel()) {
+  // Validate that the featureLevel is an allowed feature level string value. If
+  // not return a null adapter. This logic will evolve as feature levels are
+  // added in the future.
+  if (options->hasFeatureLevel() && options->featureLevel() != "core" &&
+      options->featureLevel() != "compatibility") {
     OnRequestAdapterCallback(script_state, options, resolver,
                              wgpu::RequestAdapterStatus::Error, nullptr,
                              "Unknown feature level");
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_request_adapter_options.idl b/third_party/blink/renderer/modules/webgpu/gpu_request_adapter_options.idl
@@ -10,7 +10,7 @@ enum GPUPowerPreference {
 };
 
 dictionary GPURequestAdapterOptions {
-    [RuntimeEnabled=WebGPUExperimentalFeatures] DOMString featureLevel;
+    [RuntimeEnabled=WebGPUExperimentalFeatures] DOMString featureLevel = "core";
     GPUPowerPreference powerPreference;
     boolean forceFallbackAdapter = false;
     [RuntimeEnabled=WebGPUExperimentalFeatures] boolean compatibilityMode = false;
