diff options
author | Corey Farwell <coreyf@rwell.org> | 2016-12-08 08:43:52 -1000 |
---|---|---|
committer | Corey Farwell <coreyf@rwell.org> | 2016-12-08 08:50:35 -1000 |
commit | 449f6337d4d42dcc93c015e63bba80068a109513 (patch) | |
tree | 6d1808c4d56f542a89754d514e86e85858655688 /components/script/dom/node.rs | |
parent | 0fe94a6724a42da8f02a60d1efe18fdfc96885ae (diff) | |
download | servo-449f6337d4d42dcc93c015e63bba80068a109513.tar.gz servo-449f6337d4d42dcc93c015e63bba80068a109513.zip |
Rename `Reflectable` to `DomObject`.
Fixes https://github.com/servo/servo/issues/8473.
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r-- | components/script/dom/node.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 5f979bd8c9f..983f11f478c 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -24,7 +24,7 @@ use dom::bindings::inheritance::{SVGElementTypeId, SVGGraphicsElementTypeId}; use dom::bindings::js::{JS, LayoutJS, MutNullableHeap}; use dom::bindings::js::Root; use dom::bindings::js::RootedReference; -use dom::bindings::reflector::{Reflectable, reflect_dom_object}; +use dom::bindings::reflector::{DomObject, reflect_dom_object}; use dom::bindings::str::{DOMString, USVString}; use dom::bindings::xmlname::namespace_from_domstring; use dom::characterdata::{CharacterData, LayoutCharacterDataHelpers}; @@ -800,7 +800,7 @@ impl Node { pub fn insert_cell_or_row<F, G, I>(&self, index: i32, get_items: F, new_child: G) -> Fallible<Root<HTMLElement>> where F: Fn() -> Root<HTMLCollection>, G: Fn() -> Root<I>, - I: DerivedFrom<Node> + DerivedFrom<HTMLElement> + Reflectable, + I: DerivedFrom<Node> + DerivedFrom<HTMLElement> + DomObject, { if index < -1 { return Err(Error::IndexSize); @@ -1345,7 +1345,7 @@ impl Node { document: &Document, wrap_fn: unsafe extern "Rust" fn(*mut JSContext, &GlobalScope, Box<N>) -> Root<N>) -> Root<N> - where N: DerivedFrom<Node> + Reflectable + where N: DerivedFrom<Node> + DomObject { let window = document.window(); reflect_dom_object(node, window, wrap_fn) @@ -2373,11 +2373,11 @@ impl NodeMethods for Node { } } -pub fn document_from_node<T: DerivedFrom<Node> + Reflectable>(derived: &T) -> Root<Document> { +pub fn document_from_node<T: DerivedFrom<Node> + DomObject>(derived: &T) -> Root<Document> { derived.upcast().owner_doc() } -pub fn window_from_node<T: DerivedFrom<Node> + Reflectable>(derived: &T) -> Root<Window> { +pub fn window_from_node<T: DerivedFrom<Node> + DomObject>(derived: &T) -> Root<Window> { let document = document_from_node(derived); Root::from_ref(document.window()) } |