Changeset 272433 in webkit

Timestamp:

Feb 5, 2021, 12:18:09 PM (6 years ago)

Author:

Patrick Angle

Message:

Web Inspector: Implement backend support for maintaining a list of Grid layout contexts
​https://bugs.webkit.org/show_bug.cgi?id=221228

Reviewed by Devin Rousso.

Source/JavaScriptCore:

Added CSS.LayoutContextType property to DOM.Node and added CSS.nodeLayoutContextTypeChanged event.

• inspector/protocol/CSS.json:
• Added CSS.LayoutContextType type.
• Added DOM.nodeLayoutContextTypeChanged event.
• inspector/protocol/DOM.json:
• Added layoutContextType property to DOM.Node type.

Source/WebCore:

Test: inspector/dom/layout-context.html

Implemented support for getting the layout context for grid nodes as part of the existing DOM.Node protocol
object as well as firing an event when the layout context type changes for a node.

• dom/Element.cpp:

(WebCore::Element::didChangeRenderer):

• Handle the underlying RenderObject changing.
• dom/Element.h:
• dom/Node.h:

(WebCore::Node::didChangeRenderer):

• inspector/InspectorInstrumentation.cpp:

(WebCore::InspectorInstrumentation::nodeLayoutContextChangedImpl):

• inspector/InspectorInstrumentation.h:

(WebCore::InspectorInstrumentation::nodeLayoutContextChanged):

• Add instrumentation for layout context changes.
• inspector/agents/InspectorCSSAgent.cpp:

(WebCore::InspectorCSSAgent::layoutContextTypeForRenderer):
(WebCore::InspectorCSSAgent::nodeLayoutContextTypeChanged):

• Inform the frontend when a known node changes its layout context.
• inspector/agents/InspectorCSSAgent.h:
• inspector/agents/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::buildObjectForNode):

• Set the layout context for nodes that will be new to the frontend.
• rendering/RenderObject.h:

(WebCore::Node::setRenderer):

Source/WebInspectorUI:

Added layoutContextType property to WI.DOMNode and listener for CSS.nodeLayoutContextTypeChanged event.

• UserInterface/Controllers/DOMManager.js:

(WI.DOMManager.prototype.nodeLayoutContextTypeChanged):

• When a node's layout context changes, update the WI.DOMNode
• UserInterface/Models/DOMNode.js:

(WI.DOMNode):
(WI.DOMNode.prototype.get layoutContextType):
(WI.DOMNode.prototype.set layoutContextType):

• Fire an event when the layout context type changes.
• UserInterface/Protocol/CSSObserver.js:

(WI.CSSObserver.prototype.nodeLayoutContextTypeChanged):

• Listen for the CSS.nodeLayoutContextTypeChanged event.

LayoutTests:

Added tests for CSS.nodeLayoutContextTypeChanged event and corresponding properties.

• inspector/css/nodeLayoutContextTypeChanged-expected.txt: Added.
• inspector/css/nodeLayoutContextTypeChanged.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/css/nodeLayoutContextTypeChanged-expected.txt (added)
• LayoutTests/inspector/css/nodeLayoutContextTypeChanged.html (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/inspector/protocol/CSS.json (modified) (2 diffs)
• Source/JavaScriptCore/inspector/protocol/DOM.json (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/dom/Element.h (modified) (1 diff)
• Source/WebCore/dom/Node.h (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.h (modified) (3 diffs)
• Source/WebCore/inspector/agents/InspectorCSSAgent.cpp (modified) (2 diffs)
• Source/WebCore/inspector/agents/InspectorCSSAgent.h (modified) (3 diffs)
• Source/WebCore/inspector/agents/InspectorDOMAgent.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderObject.h (modified) (1 diff)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Models/DOMNode.js (modified) (4 diffs)
• Source/WebInspectorUI/UserInterface/Protocol/CSSObserver.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-02-05  Patrick Angle  <pangle@apple.com>
+
+        Web Inspector: Implement backend support for maintaining a list of Grid layout contexts
+        https://bugs.webkit.org/show_bug.cgi?id=221228
+
+        Reviewed by Devin Rousso.
+
+        Added tests for `CSS.nodeLayoutContextTypeChanged` event and corresponding properties.
+
+        * inspector/css/nodeLayoutContextTypeChanged-expected.txt: Added.
+        * inspector/css/nodeLayoutContextTypeChanged.html: Added.
+
 2021-02-05  Rini Patel  <rini_patel@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-02-05  Patrick Angle  <pangle@apple.com>
+
+        Web Inspector: Implement backend support for maintaining a list of Grid layout contexts
+        https://bugs.webkit.org/show_bug.cgi?id=221228
+
+        Reviewed by Devin Rousso.
+
+        Added `CSS.LayoutContextType` property to `DOM.Node` and added `CSS.nodeLayoutContextTypeChanged` event.
+
+        * inspector/protocol/CSS.json:
+        - Added `CSS.LayoutContextType` type.
+        - Added `DOM.nodeLayoutContextTypeChanged` event.
+        * inspector/protocol/DOM.json:
+        - Added `layoutContextType` property to `DOM.Node` type.
+
 2021-02-05  Yusuke Suzuki  <ysuzuki@apple.com>
 

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

@@ -253 +253 @@
                 { "name": "defaultValue", "type": "number", "description": "The value that is used for the axis when it is not otherwise controlled." }
             ]
+        },
+        {
+            "id": "LayoutContextType",
+            "type": "string",
+            "enum": ["grid"],
+            "description": "The layout context type of a node."
         }
     ],
@@ -442 +448 @@
                 { "name": "styleSheetId", "$ref": "StyleSheetId", "description": "Identifier of the removed stylesheet." }
             ]
+        },
+        {
+            "name": "nodeLayoutContextTypeChanged",
+            "description": "Called when a node's layout context type has changed.",
+            "parameters": [
+                { "name": "nodeId", "$ref": "DOM.NodeId", "description": "Identifier of the node whose layout context type changed." },
+                { "name": "layoutContextType", "$ref": "LayoutContextType", "optional": true, "description": "The new layout context type of the node. When not provided, the <code>LayoutContextType</code> of the node is not a context for which Web Inspector has specific functionality." }
+            ]
         }
     ]

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

@@ -67 +67 @@
                 { "name": "templateContent", "$ref": "Node", "optional": true, "description": "Content document fragment for template elements" },
                 { "name": "pseudoElements", "type": "array", "items": { "$ref": "Node" }, "optional": true, "description": "Pseudo elements associated with this node." },
-                { "name": "contentSecurityPolicyHash", "type": "string", "optional": true, "description": "Computed SHA-256 Content Security Policy hash source for given element." }
+                { "name": "contentSecurityPolicyHash", "type": "string", "optional": true, "description": "Computed SHA-256 Content Security Policy hash source for given element." },
+                { "name": "layoutContextType", "$ref": "CSS.LayoutContextType", "optional": true, "description": "The layout context type of the node. When not provided, the <code>LayoutContextType</code> of the node is not a context for which Web Inspector has specific functionality." }
             ]
         },

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-02-05  Patrick Angle  <pangle@apple.com>
+
+        Web Inspector: Implement backend support for maintaining a list of Grid layout contexts
+        https://bugs.webkit.org/show_bug.cgi?id=221228
+
+        Reviewed by Devin Rousso.
+
+        Test: inspector/dom/layout-context.html
+
+        Implemented support for getting the layout context for `grid` nodes as part of the existing `DOM.Node` protocol
+        object as well as firing an event when the layout context type changes for a node.
+
+        * dom/Element.cpp:
+        (WebCore::Element::didChangeRenderer):
+        - Handle the underlying RenderObject changing.
+        * dom/Element.h:
+        * dom/Node.h:
+        (WebCore::Node::didChangeRenderer):
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::nodeLayoutContextChangedImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::nodeLayoutContextChanged):
+        - Add instrumentation for layout context changes.
+        * inspector/agents/InspectorCSSAgent.cpp:
+        (WebCore::InspectorCSSAgent::layoutContextTypeForRenderer):
+        (WebCore::InspectorCSSAgent::nodeLayoutContextTypeChanged):
+        - Inform the frontend when a known node changes its layout context.
+        * inspector/agents/InspectorCSSAgent.h:
+        * inspector/agents/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::buildObjectForNode):
+        - Set the layout context for nodes that will be new to the frontend.
+        * rendering/RenderObject.h:
+        (WebCore::Node::setRenderer):
+
 2021-02-05  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -4550 +4550 @@
 }
 
+void Element::didChangeRenderer(RenderObject* oldRenderer)
+{
+    InspectorInstrumentation::nodeLayoutContextChanged(*this, oldRenderer);
+}
+
 #if ENABLE(CSS_TYPED_OM)
 

trunk/Source/WebCore/dom/Element.h

@@ -728 +728 @@
     
     void attachAttributeNodeIfNeeded(Attr&);
+    
+    void didChangeRenderer(RenderObject*) final;
 
 #if ASSERT_ENABLED

trunk/Source/WebCore/dom/Node.h

@@ -707 +707 @@
     static void moveTreeToNewScope(Node&, TreeScope& oldScope, TreeScope& newScope);
     void moveNodeToNewDocument(Document& oldDocument, Document& newDocument);
+    
+    virtual void didChangeRenderer(RenderObject*) { };
 
     struct NodeRareDataDeleter {

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -177 +177 @@
 }
 
+void InspectorInstrumentation::nodeLayoutContextChangedImpl(InstrumentingAgents& instrumentingAgents, Node& node, RenderObject* oldRenderer)
+{
+    if (auto* cssAgent = instrumentingAgents.enabledCSSAgent())
+        cssAgent->nodeLayoutContextTypeChanged(node, oldRenderer); 
+}
+
 void InspectorInstrumentation::willModifyDOMAttrImpl(InstrumentingAgents& instrumentingAgents, Element& element, const AtomString& oldValue, const AtomString& newValue)
 {

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -127 +127 @@
     static void willRemoveDOMNode(Document&, Node&);
     static void didRemoveDOMNode(Document&, Node&);
+    static void nodeLayoutContextChanged(Node&, RenderObject*);
     static void willModifyDOMAttr(Document&, Element&, const AtomString& oldValue, const AtomString& newValue);
     static void didModifyDOMAttr(Document&, Element&, const AtomString& name, const AtomString& value);
@@ -351 +352 @@
     static void willRemoveDOMNodeImpl(InstrumentingAgents&, Node&);
     static void didRemoveDOMNodeImpl(InstrumentingAgents&, Node&);
+    static void nodeLayoutContextChangedImpl(InstrumentingAgents&, Node&, RenderObject*);
     static void willModifyDOMAttrImpl(InstrumentingAgents&, Element&, const AtomString& oldValue, const AtomString& newValue);
     static void didModifyDOMAttrImpl(InstrumentingAgents&, Element&, const AtomString& name, const AtomString& value);
@@ -603 +605 @@
 }
 
+inline void InspectorInstrumentation::nodeLayoutContextChanged(Node& node, RenderObject* oldRenderer)
+{
+    FAST_RETURN_IF_NO_FRONTENDS(void());
+    if (auto* agents = instrumentingAgents(node.document()))
+        nodeLayoutContextChangedImpl(*agents, node, oldRenderer);
+}
+
 inline void InspectorInstrumentation::willModifyDOMAttr(Document& document, Element& element, const AtomString& oldValue, const AtomString& newValue)
 {

trunk/Source/WebCore/inspector/agents/InspectorCSSAgent.cpp

@@ -55 +55 @@
 #include "NodeList.h"
 #include "PseudoElement.h"
+#include "RenderGrid.h"
 #include "RenderStyleConstants.h"
 #include "SVGStyleElement.h"
@@ -925 +926 @@
 }
 
+Optional<Protocol::CSS::LayoutContextType> InspectorCSSAgent::layoutContextTypeForRenderer(RenderObject* renderer)
+{
+    if (is<RenderGrid>(renderer))
+        return Protocol::CSS::LayoutContextType::Grid;
+    return WTF::nullopt;
+}
+
+void InspectorCSSAgent::nodeLayoutContextTypeChanged(Node& node, RenderObject* oldRenderer)
+{
+    auto* domAgent = m_instrumentingAgents.persistentDOMAgent();
+    if (!domAgent)
+        return;
+    
+    auto newLayoutContextType = layoutContextTypeForRenderer(node.renderer());
+    if (newLayoutContextType == layoutContextTypeForRenderer(oldRenderer))
+        return;
+    
+    // FIXME: <https://webkit.org/b/221449> Support enabling events for uninstrumented nodes.
+    auto nodeId = domAgent->boundNodeId(&node);
+    if (!nodeId)
+        return;
+    
+    m_frontendDispatcher->nodeLayoutContextTypeChanged(nodeId, WTFMove(newLayoutContextType));
+}
+
 InspectorStyleSheetForInlineStyle& InspectorCSSAgent::asInspectorStyleSheet(StyledElement& element)
 {

trunk/Source/WebCore/inspector/agents/InspectorCSSAgent.h

@@ -51 +51 @@
 class Node;
 class NodeList;
+class RenderObject;
 class StyleRule;
 
@@ -82 +83 @@
 
     static CSSStyleRule* asCSSStyleRule(CSSRule&);
+    static Optional<Inspector::Protocol::CSS::LayoutContextType> layoutContextTypeForRenderer(RenderObject*);
 
     // InspectorAgentBase
@@ -114 +116 @@
     void activeStyleSheetsUpdated(Document&);
     bool forcePseudoState(const Element&, CSSSelector::PseudoClassType);
+    void nodeLayoutContextTypeChanged(Node&, RenderObject*);
 
     // InspectorDOMAgent hooks

trunk/Source/WebCore/inspector/agents/InspectorDOMAgent.cpp

@@ -94 +94 @@
 #include "Pasteboard.h"
 #include "PseudoElement.h"
+#include "RenderGrid.h"
 #include "RenderStyle.h"
 #include "RenderStyleConstants.h"
@@ -1757 +1758 @@
             value->setChildren(WTFMove(children));
     }
+    
+    if (auto layoutContextType = InspectorCSSAgent::layoutContextTypeForRenderer(node->renderer()))
+        value->setLayoutContextType(layoutContextType.value());
 
     auto* pageAgent = m_instrumentingAgents.enabledPageAgent();

trunk/Source/WebCore/rendering/RenderObject.h

@@ -1148 +1148 @@
 inline void Node::setRenderer(RenderObject* renderer)
 {
+    auto oldRenderer = this->renderer();
     m_rendererWithStyleFlags.setPointer(renderer);
+    didChangeRenderer(oldRenderer);
 }
 

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2021-02-05  Patrick Angle  <pangle@apple.com>
+
+        Web Inspector: Implement backend support for maintaining a list of Grid layout contexts
+        https://bugs.webkit.org/show_bug.cgi?id=221228
+
+        Reviewed by Devin Rousso.
+
+        Added `layoutContextType` property to `WI.DOMNode` and listener for `CSS.nodeLayoutContextTypeChanged` event.
+
+        * UserInterface/Controllers/DOMManager.js:
+        (WI.DOMManager.prototype.nodeLayoutContextTypeChanged):
+        - When a node's layout context changes, update the WI.DOMNode
+        * UserInterface/Models/DOMNode.js:
+        (WI.DOMNode):
+        (WI.DOMNode.prototype.get layoutContextType):
+        (WI.DOMNode.prototype.set layoutContextType):
+        - Fire an event when the layout context type changes.
+        * UserInterface/Protocol/CSSObserver.js:
+        (WI.CSSObserver.prototype.nodeLayoutContextTypeChanged):
+        - Listen for the `CSS.nodeLayoutContextTypeChanged` event.
+
 2021-02-04  Razvan Caliman  <rcaliman@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js

@@ -222 +222 @@
     }
 
+    nodeLayoutContextTypeChanged(nodeId, layoutContextType)
+    {
+        let domNode = this._idToDOMNode[nodeId];
+        console.assert(domNode instanceof WI.DOMNode, domNode, nodeId);
+        if (!domNode)
+            return;
+
+        domNode.layoutContextType = layoutContextType;
+    }
+
     // Private
 

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

@@ -53 +53 @@
         this._computedRole = null;
         this._contentSecurityPolicyHash = payload.contentSecurityPolicyHash;
+        this._layoutContextType = payload.layoutContextType;
 
         if (this._nodeType === Node.DOCUMENT_NODE)
@@ -241 +242 @@
     {
         this._childNodeCount = count;
+    }
+
+    get layoutContextType()
+    {
+        return this._layoutContextType;
+    }
+
+    set layoutContextType(layoutContextType)
+    {
+        console.assert(layoutContextType !== this._layoutContextType);
+        this._layoutContextType = layoutContextType;
+        this.dispatchEventToListeners(WI.DOMNode.Event.LayoutContextTypeChanged);
     }
 
@@ -1123 +1136 @@
     DidFireEvent: "dom-node-did-fire-event",
     PowerEfficientPlaybackStateChanged: "dom-node-power-efficient-playback-state-changed",
+    LayoutContextTypeChanged: "dom-node-layout-context-type-changed",
 };
 
@@ -1142 +1156 @@
     Failed: "failed",
 };
+
+// Corresponds to `CSS.LayoutContextType`.
+WI.DOMNode.LayoutContextType = {
+    Grid: "grid",
+};

trunk/Source/WebInspectorUI/UserInterface/Protocol/CSSObserver.js

@@ -48 +48 @@
     }
 
+    nodeLayoutContextTypeChanged(nodeId, layoutContextType)
+    {
+        WI.domManager.nodeLayoutContextTypeChanged(nodeId, layoutContextType);
+    }
+
     namedFlowCreated(namedFlow)
     {