Changeset 223921 in webkit

Timestamp:

Oct 24, 2017 2:17:17 PM (6 years ago)

Author:

webkit@devinrousso.com

Message:

Web Inspector: allow ShaderProgram to be shown in CanvasContentView
​https://bugs.webkit.org/show_bug.cgi?id=178714

Reviewed by Brian Burg.

• UserInterface/Views/CanvasDetailsSidebarPanel.js:

(WI.CanvasDetailsSidebarPanel.prototype.inspect):
Allow ShaderProgram to show the related Canvas information.

• UserInterface/Views/CanvasTabContentView.js:

(WI.CanvasTabContentView.prototype.canShowRepresentedObject):
(WI.CanvasTabContentView.prototype.showRepresentedObject):
(WI.CanvasTabContentView.prototype._canvasTreeOutlineSelectionDidChange):
If a ShaderProgram is selected in the path component, display a ShaderProgramContentView.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CanvasDetailsSidebarPanel.js (modified) (1 diff)
• UserInterface/Views/CanvasTabContentView.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-10-24  Devin Rousso  <webkit@devinrousso.com>
+
+        Web Inspector: allow ShaderProgram to be shown in CanvasContentView
+        https://bugs.webkit.org/show_bug.cgi?id=178714
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Views/CanvasDetailsSidebarPanel.js:
+        (WI.CanvasDetailsSidebarPanel.prototype.inspect):
+        Allow ShaderProgram to show the related Canvas information.
+
+        * UserInterface/Views/CanvasTabContentView.js:
+        (WI.CanvasTabContentView.prototype.canShowRepresentedObject):
+        (WI.CanvasTabContentView.prototype.showRepresentedObject):
+        (WI.CanvasTabContentView.prototype._canvasTreeOutlineSelectionDidChange):
+        If a ShaderProgram is selected in the path component, display a ShaderProgramContentView.
+
 2017-10-24  Devin Rousso  <webkit@devinrousso.com>
 

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

@@ -43 +43 @@
             objects = [objects];
 
-        objects = objects.map((object) => object instanceof WI.Recording ? object.source : object);
+        objects = objects.map((object) => {
+            if (object instanceof WI.Recording)
+                return object.source;
+            if (object instanceof WI.ShaderProgram)
+                return object.canvas;
+            return object;
+        });
 
         this.canvas = objects.find((object) => object instanceof WI.Canvas);

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

@@ -91 +91 @@
     canShowRepresentedObject(representedObject)
     {
-        return representedObject instanceof WI.CanvasCollection || representedObject instanceof WI.Recording;
+        return representedObject instanceof WI.CanvasCollection
+            || representedObject instanceof WI.Recording
+            || representedObject instanceof WI.ShaderProgram;
     }
 
@@ -100 +102 @@
         this.navigationSidebarPanel.recording = null;
 
-        if (representedObject instanceof WI.CanvasCollection) {
+        if (representedObject instanceof WI.CanvasCollection || representedObject instanceof WI.ShaderProgram) {
             this._overviewNavigationItem.hidden = true;
             WI.navigationSidebar.collapsed = true;
@@ -195 +197 @@
         if (this.canShowRepresentedObject(representedObject)) {
             this.showRepresentedObject(representedObject);
-            this._updateActionIndex(0);
+
+            if (representedObject instanceof WI.Recording)
+                this._updateActionIndex(0);
             return;
         }