Changeset 250858 in webkit

Timestamp:

Oct 8, 2019 1:49:48 PM (5 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Canvas: don't show an empty preview for WebGPU devices
​https://bugs.webkit.org/show_bug.cgi?id=202679

Reviewed by Matt Baker.

HTMLCanvasElement.prototype.toDataURL hasn't been hooked up for GPUCanvasContext yet, so
calling Canvas.requestContent with a WebGPUDevice won't give us any good results.

As such, the Web Inspector frontend should show something slightly more actionable, such as
a more generic non-error "No Preview Available" message.

• UserInterface/Models/Canvas.js:

(WI.Canvas.supportsRequestContentForContextType): Added.
(WI.Canvas.prototype.requestContent):

• UserInterface/Views/CanvasContentView.js:

(WI.CanvasContentView.prototype._showError):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Models/Canvas.js (modified) (2 diffs)
• UserInterface/Views/CanvasContentView.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-10-08  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Canvas: don't show an empty preview for WebGPU devices
+        https://bugs.webkit.org/show_bug.cgi?id=202679
+
+        Reviewed by Matt Baker.
+
+        `HTMLCanvasElement.prototype.toDataURL` hasn't been hooked up for `GPUCanvasContext` yet, so
+        calling `Canvas.requestContent` with a `WebGPUDevice` won't give us any good results.
+
+        As such, the Web Inspector frontend should show something slightly more actionable, such as
+        a more generic non-error "No Preview Available" message.
+
+        * UserInterface/Models/Canvas.js:
+        (WI.Canvas.supportsRequestContentForContextType): Added.
+        (WI.Canvas.prototype.requestContent):
+
+        * UserInterface/Views/CanvasContentView.js:
+        (WI.CanvasContentView.prototype._showError):
+
 2019-10-08  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Models/Canvas.js

@@ -118 +118 @@
     }
 
+    static supportsRequestContentForContextType(contextType)
+    {
+        switch (contextType) {
+        case Canvas.ContextType.WebGPU:
+        case Canvas.ContextType.WebMetal:
+            return false;
+        }
+        return true;
+    }
+
     // Public
 
@@ -200 +210 @@
     requestContent()
     {
+        if (!Canvas.supportsRequestContentForContextType(this._contextType))
+            return Promise.resolve(null);
         return CanvasAgent.requestContent(this._identifier).then((result) => result.content).catch((error) => console.error(error));
     }

trunk/Source/WebInspectorUI/UserInterface/Views/CanvasContentView.js

@@ -249 +249 @@
 
         if (!this._errorElement) {
-            const isError = true;
+            let isError = WI.Canvas.supportsRequestContentForContextType(this.representedObject.contextType);
             this._errorElement = WI.createMessageTextView(WI.UIString("No Preview Available"), isError);
         }