Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-07 23:43:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement Document.createNodeIterator and rebase patch

Browse source
This commit is contained in:
Jinwoo Song 2015-04-29 18:08:37 +09:00
parent 0e4c792dc5
commit 4e8005cd5b
3 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/document.rs
View file

@ -58,6 +58,7 @@ use dom::keyboardevent::KeyboardEvent;
use dom::messageevent::MessageEvent; use dom::messageevent::MessageEvent;
use dom::node::{self, Node, NodeHelpers, NodeTypeId, CloneChildrenFlag, NodeDamage, window_from_node}; use dom::node::{self, Node, NodeHelpers, NodeTypeId, CloneChildrenFlag, NodeDamage, window_from_node};
use dom::nodelist::NodeList; use dom::nodelist::NodeList;
use dom::nodeiterator::NodeIterator;
use dom::text::Text; use dom::text::Text;
use dom::processinginstruction::ProcessingInstruction; use dom::processinginstruction::ProcessingInstruction;
use dom::range::Range; use dom::range::Range;
@ -1363,6 +1364,12 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
Range::new_with_doc(self) Range::new_with_doc(self)
} }
// https://dom.spec.whatwg.org/#dom-document-createnodeiterator
fn CreateNodeIterator(self, root: JSRef<Node>, whatToShow: u32, filter: Option<NodeFilter>)
-> Temporary<NodeIterator> {
NodeIterator::new(self, root, whatToShow, filter)
}
// https://dom.spec.whatwg.org/#dom-document-createtreewalker // https://dom.spec.whatwg.org/#dom-document-createtreewalker
fn CreateTreeWalker(self, root: JSRef<Node>, whatToShow: u32, filter: Option<NodeFilter>) fn CreateTreeWalker(self, root: JSRef<Node>, whatToShow: u32, filter: Option<NodeFilter>)
-> Temporary<TreeWalker> { -> Temporary<TreeWalker> {

12
components/script/dom/nodeiterator.rs
View file

@ -7,18 +7,16 @@ use dom::bindings::codegen::Bindings::NodeIteratorBinding::NodeIteratorMethods;
use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter; use dom::bindings::codegen::Bindings::NodeFilterBinding::NodeFilter;
use dom::bindings::error::Fallible; use dom::bindings::error::Fallible;
use dom::bindings::global::GlobalRef; use dom::bindings::global::GlobalRef;
use dom::bindings::js::{JS, JSRef, Temporary}; use dom::bindings::js::{JS, JSRef, MutNullableHeap, Temporary, Rootable};
use dom::bindings::js::MutNullableJS;
use dom::bindings::utils::{Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflector, reflect_dom_object};
use dom::document::{Document, DocumentHelpers}; use dom::document::{Document, DocumentHelpers};
use dom::node::{Node}; use dom::node::{Node};
use std::default::Default;
#[dom_struct] #[dom_struct]
pub struct NodeIterator { pub struct NodeIterator {
reflector_: Reflector, reflector_: Reflector,
root_node: JS<Node>, root_node: JS<Node>,
reference_node: MutNullableJS<Node>, reference_node: MutNullableHeap<JS<Node>>,
what_to_show: u32, what_to_show: u32,
filter: Filter filter: Filter
} }
@ -30,7 +28,7 @@ impl NodeIterator {
NodeIterator { NodeIterator {
reflector_: Reflector::new(), reflector_: Reflector::new(),
root_node: JS::from_rooted(root_node), root_node: JS::from_rooted(root_node),
reference_node: Default::default(), reference_node: MutNullableHeap::new(Some(JS::from_rooted(root_node))),
what_to_show: what_to_show, what_to_show: what_to_show,
filter: filter filter: filter
} }
@ -61,7 +59,7 @@ impl NodeIterator {
impl<'a> NodeIteratorMethods for JSRef<'a, NodeIterator> { impl<'a> NodeIteratorMethods for JSRef<'a, NodeIterator> {
// https://dom.spec.whatwg.org/#dom-nodeiterator-root // https://dom.spec.whatwg.org/#dom-nodeiterator-root
fn Root(self) -> Temporary<Node> { fn Root(self) -> Temporary<Node> {
Temporary::new(self.root_node) Temporary::from_rooted(self.root_node)
} }
// https://dom.spec.whatwg.org/#dom-nodeiterator-whattoshow // https://dom.spec.whatwg.org/#dom-nodeiterator-whattoshow
@ -80,7 +78,7 @@ impl<'a> NodeIteratorMethods for JSRef<'a, NodeIterator> {
// https://dom.spec.whatwg.org/#dom-nodeiterator-referencenode // https://dom.spec.whatwg.org/#dom-nodeiterator-referencenode
fn GetReferenceNode(self) -> Option<Temporary<Node>> { fn GetReferenceNode(self) -> Option<Temporary<Node>> {
self.reference_node.get() self.reference_node.get().map(Temporary::from_rooted)
} }
// https://dom.spec.whatwg.org/#dom-nodeiterator-previousnode // https://dom.spec.whatwg.org/#dom-nodeiterator-previousnode

4
components/script/dom/webidls/Document.webidl
View file

@ -58,8 +58,8 @@ interface Document : Node {
Range createRange(); Range createRange();
// NodeFilter.SHOW_ALL = 0xFFFFFFFF // NodeFilter.SHOW_ALL = 0xFFFFFFFF
// [NewObject] [NewObject]
// NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null); NodeIterator createNodeIterator(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
[NewObject] [NewObject]
TreeWalker createTreeWalker(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null); TreeWalker createTreeWalker(Node root, optional unsigned long whatToShow = 0xFFFFFFFF, optional NodeFilter? filter = null);
}; };