mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 888528 - Add node deletion/insertion to the walker actor. r=jwalker
This commit is contained in:
Dave Camp
parent
c7ce3ea2eb
commit
b5d3af5ed3
@ -1381,6 +1381,46 @@ var WalkerActor = protocol.ActorClass({
|
||||
}
|
||||
}),
|
||||
|
||||
/**
|
||||
* Removes a node from its parent node.
|
||||
*
|
||||
* @returns The node's nextSibling before it was removed.
|
||||
*/
|
||||
removeNode: method(function(node) {
|
||||
if ((node.rawNode.ownerDocument &&
|
||||
node.rawNode.ownerDocument.documentElement === this.rawNode) ||
|
||||
node.rawNode.nodeType === Ci.nsIDOMNode.DOCUMENT_NODE) {
|
||||
throw Error("Cannot remove document or document elements.");
|
||||
}
|
||||
let nextSibling = this.nextSibling(node);
|
||||
if (node.rawNode.parentNode) {
|
||||
node.rawNode.parentNode.removeChild(node.rawNode);
|
||||
// Mutation events will take care of the rest.
|
||||
}
|
||||
return nextSibling;
|
||||
}, {
|
||||
request: {
|
||||
node: Arg(0, "domnode")
|
||||
},
|
||||
response: {
|
||||
nextSibling: RetVal("domnode", { optional: true })
|
||||
}
|
||||
}),
|
||||
|
||||
/**
|
||||
* Insert a node into the DOM.
|
||||
*/
|
||||
insertBefore: method(function(node, parent, sibling) {
|
||||
parent.rawNode.insertBefore(node.rawNode, sibling ? sibling.rawNode : null);
|
||||
}, {
|
||||
request: {
|
||||
node: Arg(0, "domnode"),
|
||||
parent: Arg(1, "domnode"),
|
||||
sibling: Arg(2, "domnode", { optional: true })
|
||||
},
|
||||
response: {}
|
||||
}),
|
||||
|
||||
/**
|
||||
* Get any pending mutation records. Must be called by the client after
|
||||
* the `new-mutations` notification is received. Returns an array of
|
||||
|
||||
@ -16,11 +16,13 @@ MOCHITEST_CHROME_FILES = \
|
||||
inspector-traversal-data.html \
|
||||
test_inspector-changeattrs.html \
|
||||
test_inspector-changevalue.html \
|
||||
test_inspector-insert.html \
|
||||
test_inspector-mutations-attr.html \
|
||||
test_inspector-mutations-childlist.html \
|
||||
test_inspector-mutations-frameload.html \
|
||||
test_inspector-mutations-value.html \
|
||||
test_inspector-release.html \
|
||||
test_inspector-remove.html \
|
||||
test_inspector-retain.html \
|
||||
test_inspector-pseudoclass-lock.html \
|
||||
test_inspector-traversal.html \
|
||||
|
||||
@ -0,0 +1,96 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=
|
||||
-->
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Test for Bug </title>
|
||||
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
|
||||
<script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
|
||||
<script type="application/javascript;version=1.8">
|
||||
Components.utils.import("resource://gre/modules/devtools/Loader.jsm");
|
||||
|
||||
const promise = devtools.require("sdk/core/promise");
|
||||
const inspector = devtools.require("devtools/server/actors/inspector");
|
||||
|
||||
window.onload = function() {
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
runNextTest();
|
||||
}
|
||||
|
||||
var gWalker = null;
|
||||
var gClient = null;
|
||||
|
||||
function assertOwnership() {
|
||||
return assertOwnershipTrees(gWalker);
|
||||
}
|
||||
|
||||
addTest(function setup() {
|
||||
let url = document.getElementById("inspectorContent").href;
|
||||
attachURL(url, function(err, client, tab, doc) {
|
||||
gInspectee = doc;
|
||||
let {InspectorFront} = devtools.require("devtools/server/actors/inspector");
|
||||
let inspector = InspectorFront(client, tab);
|
||||
promiseDone(inspector.getWalker().then(walker => {
|
||||
ok(walker, "getWalker() should return an actor.");
|
||||
gClient = client;
|
||||
gWalker = walker;
|
||||
}).then(runNextTest));
|
||||
});
|
||||
});
|
||||
|
||||
addTest(function testRearrange() {
|
||||
let longlist = null;
|
||||
let nodeA = null;
|
||||
let nextNode = null;
|
||||
|
||||
promiseDone(gWalker.querySelector(gWalker.rootNode, "#longlist").then(listFront => {
|
||||
longlist = listFront;
|
||||
}).then(() => {
|
||||
return gWalker.children(longlist);
|
||||
}).then(response => {
|
||||
nodeA = response.nodes[0];
|
||||
is(nodeA.id, "a", "Got the expected node.");
|
||||
// Move nodeA to the end of the list.
|
||||
return gWalker.insertBefore(nodeA, longlist, null);
|
||||
}).then(() => {
|
||||
ok(!gInspectee.querySelector("#a").nextSibling, "a should now be at the end of the list.");
|
||||
return gWalker.children(longlist);
|
||||
}).then(response => {
|
||||
is(nodeA, response.nodes[response.nodes.length - 1], "a should now be the last returned child.");
|
||||
// Now move it to the middle of the list.
|
||||
nextNode = response.nodes[13];
|
||||
return gWalker.insertBefore(nodeA, longlist, nextNode);
|
||||
}).then(response => {
|
||||
let sibling = inspector._documentWalker(gInspectee.querySelector("#a")).nextSibling();
|
||||
is(sibling, nextNode.rawNode(), "Node should match the expected next node.");
|
||||
return gWalker.children(longlist);
|
||||
}).then(response => {
|
||||
is(nodeA, response.nodes[13], "a should be where we expect it.");
|
||||
is(nextNode, response.nodes[14], "next node should be where we expect it.");
|
||||
}).then(runNextTest));
|
||||
});
|
||||
|
||||
addTest(function cleanup() {
|
||||
delete gWalker;
|
||||
delete gClient;
|
||||
runNextTest();
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=">Mozilla Bug </a>
|
||||
<a id="inspectorContent" target="_blank" href="inspector-traversal-data.html">Test Document</a>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
|
||||
</div>
|
||||
<pre id="test">
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,96 @@
|
||||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=
|
||||
-->
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Test for Bug </title>
|
||||
|
||||
<script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
|
||||
<script type="application/javascript;version=1.8" src="inspector-helpers.js"></script>
|
||||
<script type="application/javascript;version=1.8">
|
||||
Components.utils.import("resource://gre/modules/devtools/Loader.jsm");
|
||||
|
||||
const promise = devtools.require("sdk/core/promise");
|
||||
const inspector = devtools.require("devtools/server/actors/inspector");
|
||||
|
||||
window.onload = function() {
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
runNextTest();
|
||||
}
|
||||
|
||||
var gWalker = null;
|
||||
var gClient = null;
|
||||
|
||||
function assertOwnership() {
|
||||
return assertOwnershipTrees(gWalker);
|
||||
}
|
||||
|
||||
addTest(function setup() {
|
||||
let url = document.getElementById("inspectorContent").href;
|
||||
attachURL(url, function(err, client, tab, doc) {
|
||||
gInspectee = doc;
|
||||
let {InspectorFront} = devtools.require("devtools/server/actors/inspector");
|
||||
let inspector = InspectorFront(client, tab);
|
||||
promiseDone(inspector.getWalker().then(walker => {
|
||||
ok(walker, "getWalker() should return an actor.");
|
||||
gClient = client;
|
||||
gWalker = walker;
|
||||
}).then(runNextTest));
|
||||
});
|
||||
});
|
||||
|
||||
addTest(function testRemoveSubtree() {
|
||||
let originalOwnershipSize = 0;
|
||||
let longlist = null;
|
||||
let longlistID = null;
|
||||
|
||||
let nextSibling = gInspectee.querySelector("#longlist").nextSibling;
|
||||
// Duplicate the walker logic to skip blank nodes...
|
||||
while (nextSibling && nextSibling.nodeType === Components.interfaces.nsIDOMNode.TEXT_NODE && !/[^\s]/.exec(nextSibling.nodeValue)) {
|
||||
nextSibling = nextSibling.nextSibling;
|
||||
}
|
||||
|
||||
promiseDone(gWalker.querySelector(gWalker.rootNode, "#longlist").then(listFront => {
|
||||
longlist = listFront;
|
||||
longlistID = longlist.actorID;
|
||||
}).then(() => {
|
||||
return gWalker.children(longlist);
|
||||
}).then((items)=> {
|
||||
originalOwnershipSize = assertOwnership();
|
||||
ok(originalOwnershipSize > 26, "Should have at least 26 items in our ownership tree");
|
||||
return gWalker.removeNode(longlist);
|
||||
}).then(nextSiblingFront => {
|
||||
is(nextSiblingFront.rawNode(), nextSibling, "Should have returned the next sibling.");
|
||||
return waitForMutation(gWalker, isChildList);
|
||||
}).then(() => {
|
||||
// Our ownership size should now be 26 fewer (we forgot about #longlist + 26 children, but learned about #longlist's next sibling)
|
||||
let newOwnershipSize = assertOwnership();
|
||||
is(newOwnershipSize, originalOwnershipSize - 26, "Ownership tree should have dropped by 27 nodes");
|
||||
// Now verify that some nodes have gone away
|
||||
return checkMissing(gClient, longlistID);
|
||||
}).then(runNextTest));
|
||||
});
|
||||
|
||||
addTest(function cleanup() {
|
||||
delete gWalker;
|
||||
delete gClient;
|
||||
runNextTest();
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=">Mozilla Bug </a>
|
||||
<a id="inspectorContent" target="_blank" href="inspector-traversal-data.html">Test Document</a>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
|
||||
</div>
|
||||
<pre id="test">
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user