Apply Kai's feedback

toji · toji · commit 344bfce3f26c · 2022-04-26T16:35:31.000-07:00
diff --git a/spec/index.bs b/spec/index.bs
@@ -1637,6 +1637,22 @@ interface GPU {
             <!-- If we add ways to make invalid adapter requests (aside from those
                  that violate IDL rules), specify that they reject the promise. -->
         </div>
+
+    : <dfn>getPreferredCanvasFormat()</dfn>
+    ::
+        Returns an optimal {{GPUTextureFormat}} to use for {{GPUCanvasContext}}s on this system.
+
+        <div algorithm="GPU.getPreferredCanvasFormat">
+            **Called on:** {{GPU}} this.
+
+            **Returns:** {{GPUTextureFormat}}
+
+            <div class=content-timeline>
+                1. Return an optimal {{GPUTextureFormat}} to use when calling
+                    {{GPUCanvasContext/configure()}} on a {{GPUCanvasContext}} on this system. Must
+                    be one of the [=supported context formats=].
+            </div>
+        </div>
 </dl>
 
 {{GPU}} has the following internal slots:
@@ -1791,7 +1807,6 @@ interface GPUAdapter {
     readonly attribute boolean isFallbackAdapter;
 
     Promise<GPUDevice> requestDevice(optional GPUDeviceDescriptor descriptor = {});
-    GPUTextureFormat getPreferredContextFormat();
 };
 </script>
 
@@ -1896,23 +1911,6 @@ interface GPUAdapter {
             1. Return |promise|.
 
         </div>
-
-    : <dfn>getPreferredContextFormat()</dfn>
-    ::
-        Returns an optimal {{GPUTextureFormat}} to use for {{GPUCanvasContext}}s with devices
-        created from this adapter.
-
-        <div algorithm="GPUCanvasContext.getPreferredContextFormat">
-            **Called on:** {{GPUAdapter}} |this|.
-
-            **Returns:** {{GPUTextureFormat}}
-
-            <div class=content-timeline>
-                1. Return an optimal {{GPUTextureFormat}} to use when calling
-                    {{GPUCanvasContext/configure()}} on a {{GPUCanvasContext}} with a {{GPUDevice}}
-                    created by |this|. Must be one of the [=supported context formats=].
-            </div>
-        </div>
 </dl>
 
 <div class="example">
@@ -9747,11 +9745,11 @@ dictionary GPUCanvasConfiguration {
     format for this context:
     <pre highlight="js">
         const canvas = document.createElement('canvas');
-        const context =  canvas.getContext('webgpu');
+        const context = canvas.getContext('webgpu');
 
         context.configure({
             device: gpuDevice,
-            format: gpuAdapter.getPreferredContextFormat(),
+            format: navigator.gpu.getPreferredCanvasFormat(),
         });
     </pre>
 </div>
@@ -9804,7 +9802,7 @@ must be reconfigured by calling {{GPUCanvasContext/configure()}} again with the
                 if (entry.target != canvas) { continue; }
                 context.configure({
                     device: gpuDevice,
-                    format: gpuAdapter.getPreferredContextFormat(),
+                    format: navigator.gpu.getPreferredCanvasFormat(),
                     size: {
                         // This reports the size of the canvas element in pixels
                         width: entry.devicePixelContentBoxSize[0].inlineSize,
