| OLD | NEW |
| 1 function initialize_domTest() | 1 function initialize_domTest() |
| 2 { | 2 { |
| 3 | 3 |
| 4 InspectorTest.trackGetChildNodesEvents = function(nodeInfo, callback) | 4 InspectorTest.trackGetChildNodesEvents = function(nodeInfo, callback) |
| 5 { | 5 { |
| 6 InspectorTest.eventHandler["DOM.setChildNodes"] = setChildNodes; | 6 InspectorTest.eventHandler["DOM.setChildNodes"] = setChildNodes; |
| 7 | 7 |
| 8 function setChildNodes(message) | 8 function setChildNodes(message) |
| 9 { | 9 { |
| 10 var nodes = message.params.nodes; | 10 var nodes = message.params.nodes; |
| 11 for (var i = 0; i < nodes.length; ++i) | 11 for (var i = 0; i < nodes.length; ++i) |
| 12 InspectorTest.addNode(nodeInfo, nodes[i]); | 12 InspectorTest.addNode(nodeInfo, nodes[i]); |
| 13 if (callback) | 13 if (callback) |
| 14 callback(); | 14 callback(); |
| 15 } | 15 } |
| 16 } | 16 } |
| 17 | 17 |
| 18 InspectorTest.addNode = function(nodeInfo, node) | 18 InspectorTest.addNode = function(nodeInfo, node) |
| 19 { | 19 { |
| 20 nodeInfo[node.nodeId] = node; | 20 nodeInfo[node.nodeId] = node; |
| 21 delete node.nodeId; | 21 delete node.nodeId; |
| 22 var children = node.children || []; | 22 var children = node.children || []; |
| 23 for (var i = 0; i < children.length; ++i) | 23 for (var i = 0; i < children.length; ++i) |
| 24 InspectorTest.addNode(nodeInfo, children[i]); | 24 InspectorTest.addNode(nodeInfo, children[i]); |
| 25 var shadowRoots = node.shadowRoots || []; | 25 var shadowRoots = node.shadowRoots || []; |
| 26 for (var i = 0; i < shadowRoots.length; ++i) | 26 for (var i = 0; i < shadowRoots.length; ++i) |
| 27 InspectorTest.addNode(nodeInfo, shadowRoots[i]); | 27 InspectorTest.addNode(nodeInfo, shadowRoots[i]); |
| 28 } | 28 } |
| 29 | 29 |
| 30 InspectorTest.requestDocumentNodeId = function(callback) | 30 InspectorTest.requestDocumentNodeId = async function(callback) |
| 31 { | 31 { |
| 32 InspectorTest.sendCommandOrDie("DOM.getDocument", {}, onGotDocument); | 32 var result = await InspectorTest.sendCommandOrDie("DOM.getDocument", {}); |
| 33 | 33 if (callback) |
| 34 function onGotDocument(result) | 34 callback(result.root.nodeId); |
| 35 { | 35 return result.root.nodeId; |
| 36 callback(result.root.nodeId); | |
| 37 } | |
| 38 }; | 36 }; |
| 39 | 37 |
| 40 InspectorTest.requestNodeId = function(documentNodeId, selector, callback) | 38 InspectorTest.requestNodeId = async function(documentNodeId, selector, callback) |
| 41 { | 39 { |
| 42 InspectorTest.sendCommandOrDie("DOM.querySelector", { "nodeId": documentNode
Id , "selector": selector }, onGotNode); | 40 var result = await InspectorTest.sendCommandOrDie("DOM.querySelector", { "no
deId": documentNodeId , "selector": selector }); |
| 43 | 41 if (callback) |
| 44 function onGotNode(result) | 42 callback(result.nodeId); |
| 45 { | 43 return result.nodeId; |
| 46 callback(result.nodeId); | |
| 47 } | |
| 48 }; | 44 }; |
| 49 | 45 |
| 50 } | 46 } |
| OLD | NEW |