Changeset 93398 in webkit

Timestamp:

Aug 19, 2011 5:50:29 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: getAttributes should work on a single node, not array.
​https://bugs.webkit.org/show_bug.cgi?id=66544

Reviewed by Adam Roben.

• inspector/Inspector.json:
• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::getAttributes):

• inspector/InspectorDOMAgent.h:
• inspector/front-end/DOMAgent.js:

(WebInspector.DOMAgent.prototype._loadNodeAttributes):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/Inspector.json (modified) (2 diffs)
• inspector/InspectorDOMAgent.cpp (modified) (1 diff)
• inspector/InspectorDOMAgent.h (modified) (1 diff)
• inspector/front-end/DOMAgent.js (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-19  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: getAttributes should work on a single node, not array.
+        https://bugs.webkit.org/show_bug.cgi?id=66544
+
+        Reviewed by Adam Roben.
+
+        * inspector/Inspector.json:
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::getAttributes):
+        * inspector/InspectorDOMAgent.h:
+        * inspector/front-end/DOMAgent.js:
+        (WebInspector.DOMAgent.prototype._loadNodeAttributes):
+
 2011-08-19  Anton Muhin  <antonm@chromium.org>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -872 +872 @@
                 ],
                 "description": "DOM interaction is implemented in terms of mirror objects that represent the actual DOM nodes. DOMNode is a base node mirror type."
-            },
-            {
-                "id": "Attributes",
-                "type": "object",
-                "properties": [
-                    { "name": "id", "$ref": "NodeId", "description": "Element id to get attributes for." },
-                    { "name": "attributes", "type": "array", "items": { "type": "string" }, "description": "An interleaved array of node attribute names and values." }
-                ],
-                "description": "A holder structure for all attributes of a single node."
             }
         ],
@@ -1099 +1090 @@
                 "name": "getAttributes",
                 "parameters": [
-                    { "name": "nodeIds", "type": "array", "items": { "$ref": "NodeId" }, "description": "Ids of the nodes to retrieve attibutes for." }
-                ],
-                "returns": [
-                    { "name": "attributes", "type": "array", "items": { "type": "Attributes" }, "description": "Attribute holders for the requested nodes." }
+                    { "name": "nodeId", "$ref": "NodeId", "description": "Id of the node to retrieve attibutes for." }
+                ],
+                "returns": [
+                    { "name": "attributes", "type": "array", "items": { "type": "string" }, "description": "An interleaved array of node attribute names and values." }
                 ],
                 "description": "Returns attributes for the specified nodes."

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1081 +1081 @@
 }
 
-void InspectorDOMAgent::getAttributes(ErrorString*, const RefPtr<InspectorArray>& nodeIds, RefPtr<InspectorArray>* result)
-{
-    for (unsigned i = 0, size = nodeIds->length(); i < size; ++i) {
-        RefPtr<InspectorValue> nodeIdValue = nodeIds->get(i);
-        int nodeId;
-        if (!nodeIdValue->asNumber(&nodeId))
-            continue;
-        Node* node = nodeForId(nodeId);
-        if (node && node->isElementNode()) {
-            RefPtr<InspectorObject> entry = InspectorObject::create();
-            entry->setNumber("nodeId", nodeId);
-            entry->setArray("attributes", buildArrayForElementAttributes(static_cast<Element*>(node)));
-            (*result)->pushObject(entry.release());
-        }
-    }
+void InspectorDOMAgent::getAttributes(ErrorString* errorString, int nodeId, RefPtr<InspectorArray>* result)
+{
+    Element* element = assertElement(errorString, nodeId);
+    if (!element)
+        return;
+
+    *result = buildArrayForElementAttributes(element);
 }
 

trunk/Source/WebCore/inspector/InspectorDOMAgent.h

@@ -129 +129 @@
     void cancelSearch(ErrorString*);
     void resolveNode(ErrorString*, int nodeId, const String* const objectGroup, RefPtr<InspectorObject>* result);
-    void getAttributes(ErrorString*, const RefPtr<InspectorArray>& nodeIds, RefPtr<InspectorArray>* result);
+    void getAttributes(ErrorString*, int nodeId, RefPtr<InspectorArray>* result);
     void setInspectModeEnabled(ErrorString*, bool enabled);
     void requestNode(ErrorString*, const String& objectId, int* nodeId);

trunk/Source/WebCore/inspector/front-end/DOMAgent.js

@@ -447 +447 @@
     _loadNodeAttributes: function()
     {
-        function callback(nodeAttributes)
+        function callback(nodeId, attributes)
         {
-            if (!nodeAttributes)
+            if (!attributes)
                 return;
-            for (var i = 0; i < nodeAttributes.length; ++i) {
-                var entry = nodeAttributes[i];
-                var node = this._idToDOMNode[entry.nodeId];
-                node._setAttributesPayload(entry.attributes);
+            var node = this._idToDOMNode[nodeId];
+            if (node) {
+                node._setAttributesPayload(attributes);
                 this.dispatchEventToListeners(WebInspector.DOMAgent.Events.AttrModified, node);
             }
@@ -461 +460 @@
         delete this._loadNodeAttributesTimeout;
 
-        var nodeIds = [];
         for (var nodeId in this._attributeLoadNodeIds)
-            nodeIds.push(Number(nodeId));
-        DOMAgent.getAttributes(nodeIds, this._wrapClientCallback(callback.bind(this)));
+            DOMAgent.getAttributes(parseInt(nodeId), this._wrapClientCallback(callback.bind(this, nodeId)));
         this._attributeLoadNodeIds = {};
     },