callback = InspectorTest.safeWrap(callback);
function onNodeFound(node)
{
- if (node)
- WebInspector._updateFocusedNode(node.id);
+ WebInspector.Revealer.reveal(node);
callback(node);
}
InspectorTest.selectPseudoIdNodeAndWaitForStyles = function(idValue, pseudoType, callback)
{
- WebInspector.showPanel("elements");
+ WebInspector.inspectorView.showPanel("elements");
callback = InspectorTest.safeWrap(callback);
var targetNode;
function removeAfter(next)
{
- executeAndDumpTree("removeLastRule()", WebInspector.DOMAgent.Events.NodeRemoved, next);
+ executeAndDumpTree("removeLastRule()", WebInspector.DOMModel.Events.NodeRemoved, next);
},
function removeBefore(next)
{
- executeAndDumpTree("removeLastRule()", WebInspector.DOMAgent.Events.NodeRemoved, next);
+ executeAndDumpTree("removeLastRule()", WebInspector.DOMModel.Events.NodeRemoved, next);
},
function addAfter(next)
{
- executeAndDumpTree("addAfterRule()", WebInspector.DOMAgent.Events.NodeInserted, next);
+ executeAndDumpTree("addAfterRule()", WebInspector.DOMModel.Events.NodeInserted, expandAndDumpTree.bind(this, next));
},
function addBefore(next)
{
- executeAndDumpTree("addBeforeRule()", WebInspector.DOMAgent.Events.NodeInserted, next);
+ executeAndDumpTree("addBeforeRule()", WebInspector.DOMModel.Events.NodeInserted, next);
},
function modifyTextContent(next)
{
- executeAndDumpTree("modifyTextContent()", WebInspector.DOMAgent.Events.NodeInserted, next);
+ executeAndDumpTree("modifyTextContent()", WebInspector.DOMModel.Events.NodeInserted, next);
},
function clearTextContent(next)
{
- executeAndDumpTree("clearTextContent()", WebInspector.DOMAgent.Events.NodeRemoved, next);
+ executeAndDumpTree("clearTextContent()", WebInspector.DOMModel.Events.NodeRemoved, next);
},
function removeNodeAndCheckPseudoElementsUnbound(next)
var inspectedBefore = inspectedNode.pseudoElements()["before"];
var inspectedAfter = inspectedNode.pseudoElements()["after"];
- executeAndDumpTree("removeNode()", WebInspector.DOMAgent.Events.NodeRemoved, callback);
+ executeAndDumpTree("removeNode()", WebInspector.DOMModel.Events.NodeRemoved, callback);
function callback()
{
- InspectorTest.addResult("inspected:before DOMNode in DOMAgent: " + !!(WebInspector.domAgent.nodeForId(inspectedBefore.id)));
- InspectorTest.addResult("inspected:after DOMNode in DOMAgent: " + !!(WebInspector.domAgent.nodeForId(inspectedAfter.id)));
+ InspectorTest.addResult("inspected:before DOMNode in DOMAgent: " + !!(WebInspector.domModel.nodeForId(inspectedBefore.id)));
+ InspectorTest.addResult("inspected:after DOMNode in DOMAgent: " + !!(WebInspector.domModel.nodeForId(inspectedAfter.id)));
next();
}
}
function executeAndDumpTree(pageFunction, eventName, next)
{
- WebInspector.domAgent.addEventListener(eventName, domCallback, this);
+ WebInspector.domModel.addEventListener(eventName, domCallback, this);
InspectorTest.evaluateInPage(pageFunction);
function domCallback()
{
- WebInspector.domAgent.removeEventListener(eventName, domCallback, this);
- WebInspector.panel("elements").treeOutline.addEventListener(WebInspector.ElementsTreeOutline.Events.ElementsTreeUpdated, treeCallback, this);
+ WebInspector.domModel.removeEventListener(eventName, domCallback, this);
+ InspectorTest.firstElementsTreeOutline().addEventListener(WebInspector.ElementsTreeOutline.Events.ElementsTreeUpdated, treeCallback, this);
}
function treeCallback()
{
- WebInspector.panel("elements").treeOutline.removeEventListener(WebInspector.ElementsTreeOutline.Events.ElementsTreeUpdated, treeCallback, this);
+ InspectorTest.firstElementsTreeOutline().removeEventListener(WebInspector.ElementsTreeOutline.Events.ElementsTreeUpdated, treeCallback, this);
InspectorTest.dumpElementsTree(containerNode);
next();
}
}
+ function expandAndDumpTree(next)
+ {
+ InspectorTest.addResult("== Expanding: ==");
+ InspectorTest.expandElementsTree(callback);
+ function callback()
+ {
+ InspectorTest.dumpElementsTree(containerNode);
+ next();
+ }
+ }
+
function selectNodeAndDumpStyles(id, pseudoTypeName, callback)
{
if (pseudoTypeName)