aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/node.rs
diff options
context:
space:
mode:
authorTetsuharu OHZEKI <saneyuki.snyk@gmail.com>2014-12-19 02:37:20 +0900
committerTetsuharu OHZEKI <saneyuki.snyk@gmail.com>2014-12-19 04:52:48 +0900
commita7bb436177d58798711403f0329b8bf84763f137 (patch)
tree5f22ccc13b133ca5a7d31eac75013ef68b5434d9 /components/script/dom/node.rs
parent824788649cd338c044d9396166af5b0f378d6685 (diff)
downloadservo-a7bb436177d58798711403f0329b8bf84763f137.tar.gz
servo-a7bb436177d58798711403f0329b8bf84763f137.zip
script: Remove glob imports added in #4405
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r--components/script/dom/node.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 50647862007..e8d6035e856 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -22,7 +22,6 @@ use dom::bindings::codegen::InheritTypes::HTMLOptGroupElementDerived;
use dom::bindings::error::Fallible;
use dom::bindings::error::Error::{NotFound, HierarchyRequest, Syntax};
use dom::bindings::global::GlobalRef;
-use dom::bindings::global;
use dom::bindings::js::{JS, JSRef, RootedReference, Temporary, Root};
use dom::bindings::js::{OptionalSettable, TemporaryPushable, OptionalRootedRootable};
use dom::bindings::js::{ResultRootable, OptionalRootable, MutNullableJS};
@@ -43,7 +42,7 @@ use dom::text::Text;
use dom::virtualmethods::{VirtualMethods, vtable_for};
use dom::window::Window;
use geom::rect::Rect;
-use layout_interface::{LayoutChan, ReapLayoutDataMsg};
+use layout_interface::{LayoutChan, Msg};
use devtools_traits::NodeInfo;
use script_traits::UntrustedNodeAddress;
use servo_util::geometry::Au;
@@ -1161,7 +1160,7 @@ impl Node {
wrap_fn: extern "Rust" fn(*mut JSContext, &GlobalRef, Box<N>) -> Temporary<N>)
-> Temporary<N> {
let window = document.window().root();
- reflect_dom_object(node, global::Window(*window), wrap_fn)
+ reflect_dom_object(node, GlobalRef::Window(*window), wrap_fn)
}
pub fn new_inherited(type_id: NodeTypeId, doc: JSRef<Document>) -> Node {
@@ -1625,7 +1624,7 @@ impl Node {
None => {}
Some(chan) => {
let LayoutChan(chan) = chan;
- chan.send(ReapLayoutDataMsg(layout_data))
+ chan.send(Msg::ReapLayoutData(layout_data))
},
}
}