Changeset 218618 in webkit

Timestamp:

Jun 20, 2017 5:07:41 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Send context attributes for tracked canvases
​https://bugs.webkit.org/show_bug.cgi?id=173327

Reviewed by Joseph Pecoraro.

Source/JavaScriptCore:

• inspector/protocol/Canvas.json:

Add ContextAttributes object type that is optionally used for WebGL canvases.

Source/WebCore:

Test: inspector/canvas/context-attributes.html

• inspector/InspectorCanvasAgent.cpp:

(WebCore::InspectorCanvasAgent::buildObjectForCanvas):

Source/WebInspectorUI:

• UserInterface/Models/Canvas.js:

(WebInspector.Canvas.fromPayload):
(WebInspector.Canvas.prototype.get contextAttributes):

• UserInterface/Views/CanvasDetailsSidebarPanel.js:

(WebInspector.CanvasDetailsSidebarPanel.prototype.initialLayout):
(WebInspector.CanvasDetailsSidebarPanel.prototype.layout):
(WebInspector.CanvasDetailsSidebarPanel.prototype.sizeDidChange):
(WebInspector.CanvasDetailsSidebarPanel.prototype._refreshAttributesSection):

• UserInterface/Views/DataGridNode.js:

(WebInspector.DataGridNode.prototype.createCellContent):
Instead of checking if the value of the cell is falsy, check that the key exists in the data.
This allows values like false to be displayed.

LayoutTests:

• inspector/canvas/context-attributes-expected.txt: Added.
• inspector/canvas/context-attributes.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/canvas/context-attributes-expected.txt (added)
• LayoutTests/inspector/canvas/context-attributes.html (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/inspector/protocol/Canvas.json (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorCanvasAgent.cpp (modified) (2 diffs)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Models/Canvas.js (modified) (4 diffs)
• Source/WebInspectorUI/UserInterface/Views/CanvasDetailsSidebarPanel.js (modified) (3 diffs)
• Source/WebInspectorUI/UserInterface/Views/DataGridNode.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-06-20  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Send context attributes for tracked canvases
+        https://bugs.webkit.org/show_bug.cgi?id=173327
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/canvas/context-attributes-expected.txt: Added.
+        * inspector/canvas/context-attributes.html: Added.
+
 2017-06-20  Matt Lewis  <jlewis3@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-06-20  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Send context attributes for tracked canvases
+        https://bugs.webkit.org/show_bug.cgi?id=173327
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/protocol/Canvas.json:
+        Add ContextAttributes object type that is optionally used for WebGL canvases.
+
 2017-06-20  Konstantin Tokarev  <annulen@yandex.ru>
 

trunk/Source/JavaScriptCore/inspector/protocol/Canvas.json

@@ -16 +16 @@
         },
         {
+            "id": "ContextAttributes",
+            "type": "object",
+            "description": "WebGL drawing surface attributes.",
+            "properties": [
+                { "name": "alpha", "type": "boolean" },
+                { "name": "depth", "type": "boolean" },
+                { "name": "stencil", "type": "boolean" },
+                { "name": "antialias", "type": "boolean" },
+                { "name": "premultipliedAlpha", "type": "boolean" },
+                { "name": "preserveDrawingBuffer", "type": "boolean" },
+                { "name": "failIfMajorPerformanceCaveat", "type": "boolean" }
+            ]
+        },
+        {
             "id": "Canvas",
             "type": "object",
@@ -24 +38 @@
                 { "name": "frameId", "$ref": "Network.FrameId", "description": "Parent frame identifier." },
                 { "name": "nodeId", "$ref": "DOM.NodeId", "optional": true, "description": "The corresponding DOM node id." },
-                { "name": "cssCanvasName", "type": "string", "optional": true, "description": "The CSS canvas identifier, for canvases created with <code>document.getCSSCanvasContext</code>." }
+                { "name": "cssCanvasName", "type": "string", "optional": true, "description": "The CSS canvas identifier, for canvases created with <code>document.getCSSCanvasContext</code>." },
+                { "name": "contextAttributes", "$ref": "ContextAttributes", "optional": true, "description": "Context attributes for WebGL rendering contexts." }
             ]
         }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-06-20  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Send context attributes for tracked canvases
+        https://bugs.webkit.org/show_bug.cgi?id=173327
+
+        Reviewed by Joseph Pecoraro.
+
+        Test: inspector/canvas/context-attributes.html
+
+        * inspector/InspectorCanvasAgent.cpp:
+        (WebCore::InspectorCanvasAgent::buildObjectForCanvas):
+
 2017-06-20  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/inspector/InspectorCanvasAgent.cpp

@@ -35 +35 @@
 #include "InstrumentingAgents.h"
 #include "MainFrame.h"
+#include "WebGLContextAttributes.h"
+#include "WebGLRenderingContextBase.h"
 #include <inspector/IdentifiersFactory.h>
 #include <inspector/InspectorProtocolObjects.h>
@@ -278 +280 @@
     }
 
+#if ENABLE(WEBGL)
+    if (is<WebGLRenderingContextBase>(context)) {
+        if (std::optional<WebGLContextAttributes> attributes = downcast<WebGLRenderingContextBase>(context)->getContextAttributes()) {
+            canvas->setContextAttributes(Inspector::Protocol::Canvas::ContextAttributes::create()
+                .setAlpha(attributes->alpha)
+                .setDepth(attributes->depth)
+                .setStencil(attributes->stencil)
+                .setAntialias(attributes->antialias)
+                .setPremultipliedAlpha(attributes->premultipliedAlpha)
+                .setPreserveDrawingBuffer(attributes->preserveDrawingBuffer)
+                .setFailIfMajorPerformanceCaveat(attributes->failIfMajorPerformanceCaveat)
+                .release());
+        }
+    }
+#endif
+
     return canvas;
 }

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-06-20  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Send context attributes for tracked canvases
+        https://bugs.webkit.org/show_bug.cgi?id=173327
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Models/Canvas.js:
+        (WebInspector.Canvas.fromPayload):
+        (WebInspector.Canvas.prototype.get contextAttributes):
+        * UserInterface/Views/CanvasDetailsSidebarPanel.js:
+        (WebInspector.CanvasDetailsSidebarPanel.prototype.initialLayout):
+        (WebInspector.CanvasDetailsSidebarPanel.prototype.layout):
+        (WebInspector.CanvasDetailsSidebarPanel.prototype.sizeDidChange):
+        (WebInspector.CanvasDetailsSidebarPanel.prototype._refreshAttributesSection):
+
+        * UserInterface/Views/DataGridNode.js:
+        (WebInspector.DataGridNode.prototype.createCellContent):
+        Instead of checking if the value of the cell is falsy, check that the key exists in the data.
+        This allows values like `false` to be displayed.
+
 2017-06-19  Devin Rousso  <drousso@apple.com>
 

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

@@ -26 +26 @@
 WebInspector.Canvas = class Canvas extends WebInspector.Object
 {
-    constructor(identifier, contextType, frame, {domNode, cssCanvasName} = {})
+    constructor(identifier, contextType, frame, {domNode, cssCanvasName, contextAttributes} = {})
     {
         super();
@@ -39 +39 @@
         this._domNode = domNode || null;
         this._cssCanvasName = cssCanvasName || "";
+        this._contextAttributes = contextAttributes || {};
     }
 
@@ -61 +62 @@
             domNode: payload.nodeId ? WebInspector.domTreeManager.nodeForId(payload.nodeId) : null,
             cssCanvasName: payload.cssCanvasName,
+            contextAttributes: payload.contextAttributes,
         });
     }
@@ -87 +89 @@
     get frame() { return this._frame; }
     get cssCanvasName() { return this._cssCanvasName; }
+    get contextAttributes() { return this._contextAttributes; }
 
     get displayName()

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

@@ -92 +92 @@
         sourceSection.groups = [new WebInspector.DetailsSectionGroup([this._nodeRow, this._cssCanvasRow, this._widthRow, this._heightRow, this._datachedRow])];
         this.contentView.element.appendChild(sourceSection.element);
+
+        this._attributesDataGridRow = new WebInspector.DetailsSectionDataGridRow(null, WebInspector.UIString("No Attributes"));
+
+        let attributesSection = new WebInspector.DetailsSection("canvas-attributes", WebInspector.UIString("Attributes"));
+        attributesSection.groups = [new WebInspector.DetailsSectionGroup([this._attributesDataGridRow])];
+        this.contentView.element.appendChild(attributesSection.element);
     }
 
@@ -103 +109 @@
         this._refreshIdentitySection();
         this._refreshSourceSection();
+        this._refreshAttributesSection();
+    }
+
+    sizeDidChange()
+    {
+        super.sizeDidChange();
+
+        // FIXME: <https://webkit.org/b/152269> Web Inspector: Convert DetailsSection classes to use View
+        this._attributesDataGridRow.sizeDidChange();
     }
 
@@ -186 +201 @@
         });
     }
+
+    _refreshAttributesSection()
+    {
+        if (!this._canvas)
+            return;
+
+        if (isEmptyObject(this._canvas.contextAttributes)) {
+            // Remove the DataGrid to show the placeholder text.
+            this._attributesDataGridRow.dataGrid = null;
+            return;
+        }
+
+        let dataGrid = this._attributesDataGridRow.dataGrid;
+        if (!dataGrid) {
+            dataGrid = this._attributesDataGridRow.dataGrid = new WebInspector.DataGrid({
+                name: {title: WebInspector.UIString("Name")},
+                value: {title: WebInspector.UIString("Value"), width: "30%"},
+            });
+        }
+
+        dataGrid.removeChildren();
+
+        for (let attribute in this._canvas.contextAttributes) {
+            let data = {name: attribute, value: this._canvas.contextAttributes[attribute]};
+            let dataGridNode = new WebInspector.DataGridNode(data);
+            dataGrid.appendChild(dataGridNode);
+        }
+
+        dataGrid.updateLayoutIfNeeded();
+    }
 };

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

@@ -384 +384 @@
     createCellContent(columnIdentifier)
     {
+        if (!(columnIdentifier in this.data))
+            return zeroWidthSpace; // Zero width space to keep the cell from collapsing.
+
         let data = this.data[columnIdentifier];
-        if (!data)
-            return zeroWidthSpace; // Zero width space to keep the cell from collapsing.
-
         return (typeof data === "number") ? data.maxDecimals(2).toLocaleString() : data;
     }