Index: third_party/WebKit/LayoutTests/http/tests/inspector-protocol/dom-protocol-test.js |
diff --git a/third_party/WebKit/LayoutTests/http/tests/inspector-protocol/dom-protocol-test.js b/third_party/WebKit/LayoutTests/http/tests/inspector-protocol/dom-protocol-test.js |
index e8ee26ae0c9b4ed6ded8065572ba713a4159b570..1be873c6c466a6db8ea2335e6353c64aa36763a3 100644 |
--- a/third_party/WebKit/LayoutTests/http/tests/inspector-protocol/dom-protocol-test.js |
+++ b/third_party/WebKit/LayoutTests/http/tests/inspector-protocol/dom-protocol-test.js |
@@ -3,48 +3,44 @@ |
InspectorTest.trackGetChildNodesEvents = function(nodeInfo, callback) |
{ |
- InspectorTest.eventHandler["DOM.setChildNodes"] = setChildNodes; |
+ InspectorTest.eventHandler["DOM.setChildNodes"] = setChildNodes; |
- function setChildNodes(message) |
- { |
- var nodes = message.params.nodes; |
- for (var i = 0; i < nodes.length; ++i) |
- InspectorTest.addNode(nodeInfo, nodes[i]); |
- if (callback) |
- callback(); |
- } |
+ function setChildNodes(message) |
+ { |
+ var nodes = message.params.nodes; |
+ for (var i = 0; i < nodes.length; ++i) |
+ InspectorTest.addNode(nodeInfo, nodes[i]); |
+ if (callback) |
+ callback(); |
+ } |
} |
InspectorTest.addNode = function(nodeInfo, node) |
{ |
- nodeInfo[node.nodeId] = node; |
- delete node.nodeId; |
- var children = node.children || []; |
- for (var i = 0; i < children.length; ++i) |
- InspectorTest.addNode(nodeInfo, children[i]); |
- var shadowRoots = node.shadowRoots || []; |
- for (var i = 0; i < shadowRoots.length; ++i) |
- InspectorTest.addNode(nodeInfo, shadowRoots[i]); |
+ nodeInfo[node.nodeId] = node; |
+ delete node.nodeId; |
+ var children = node.children || []; |
+ for (var i = 0; i < children.length; ++i) |
+ InspectorTest.addNode(nodeInfo, children[i]); |
+ var shadowRoots = node.shadowRoots || []; |
+ for (var i = 0; i < shadowRoots.length; ++i) |
+ InspectorTest.addNode(nodeInfo, shadowRoots[i]); |
} |
-InspectorTest.requestDocumentNodeId = function(callback) |
+InspectorTest.requestDocumentNodeId = async function(callback) |
{ |
- InspectorTest.sendCommandOrDie("DOM.getDocument", {}, onGotDocument); |
- |
- function onGotDocument(result) |
- { |
- callback(result.root.nodeId); |
- } |
+ var result = await InspectorTest.sendCommandOrDie("DOM.getDocument", {}); |
+ if (callback) |
+ callback(result.root.nodeId); |
+ return result.root.nodeId; |
}; |
-InspectorTest.requestNodeId = function(documentNodeId, selector, callback) |
+InspectorTest.requestNodeId = async function(documentNodeId, selector, callback) |
{ |
- InspectorTest.sendCommandOrDie("DOM.querySelector", { "nodeId": documentNodeId , "selector": selector }, onGotNode); |
- |
- function onGotNode(result) |
- { |
- callback(result.nodeId); |
- } |
+ var result = await InspectorTest.sendCommandOrDie("DOM.querySelector", { "nodeId": documentNodeId , "selector": selector }); |
+ if (callback) |
+ callback(result.nodeId); |
+ return result.nodeId; |
}; |
} |