Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 00:54:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix to avoid attribute name clash between Document/HTMLDocument

Browse source 
Use children() instead of traverse_preorder(), and avoid having
GetHead() in both Document and HTMLDocument.

Closes #1465.
This commit is contained in:
Bruno de Oliveira Abinader 2014-01-08 15:26:44 -04:00
parent 728fb9a7de
commit b5eba001ef
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/script/dom/bindings/codegen/HTMLDocument.webidl
View file

@ -17,7 +17,7 @@ interface HTMLDocument : Document {
// getter object (DOMString name);
/*[SetterThrows]
attribute HTMLElement? body;*/
readonly attribute HTMLHeadElement? head;
// readonly attribute HTMLHeadElement? head;
readonly attribute HTMLCollection images;
readonly attribute HTMLCollection embeds;
readonly attribute HTMLCollection plugins;

3
src/components/script/dom/document.rs
View file

@ -306,12 +306,13 @@ impl Document {
// http://www.whatwg.org/specs/web-apps/current-work/#dom-document-head
pub fn GetHead(&self) -> Option<AbstractNode> {
self.get_html_element().and_then(|root| {
root.traverse_preorder().find(|child| {
root.children().find(|child| {
child.type_id() == ElementNodeTypeId(HTMLHeadElementTypeId)
})
})
}
// http://www.whatwg.org/specs/web-apps/current-work/#dom-document-body
pub fn GetBody(&self, _: AbstractDocument) -> Option<AbstractNode> {
match self.get_html_element() {
None => None,

8
src/components/script/dom/htmldocument.rs
View file

@ -33,14 +33,6 @@ impl HTMLDocument {
}
impl HTMLDocument {
pub fn GetHead(&self) -> Option<AbstractNode> {
self.parent.GetDocumentElement().and_then(|root| {
root.traverse_preorder().find(|child| {
child.type_id() == ElementNodeTypeId(HTMLHeadElementTypeId)
})
})
}
pub fn Images(&self) -> @mut HTMLCollection {
self.parent.createHTMLCollection(|elem| eq_slice(elem.tag_name, "img"))
}

11
src/test/html/content/test_document_head.html
View file

@ -29,6 +29,17 @@
is(new_document.head, new_head, "test2-4, append head to a new document");
}
// test3: head's parent should be document element
{
let new_document = new Document();
let html = new_document.createElement("html");
let foo = new_document.createElement("foo");
let head = new_document.createElement("head");
new_document.appendChild(html);
html.appendChild(foo);
foo.appendChild(head);
is(new_document.head, null, "test3-0, head's parent should be document element");
}
finish();
</script>
</body>