aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/script.rs
diff options
context:
space:
mode:
authorSankha Narayan Guria <sankha93@gmail.com>2014-02-27 03:31:05 +0530
committerSankha Narayan Guria <sankha93@gmail.com>2014-02-27 03:31:05 +0530
commit1e9fec9172364346937f375e315e1ce745662611 (patch)
treea55173568e6dd6a8b4cb4dfcc42ed81204d49874 /src/components/script/script.rs
parent47e6e6ec8f2dfbd56e50f9f2ec2762b85087d948 (diff)
parentda16e54243e256dee927f720ce6b9903b62ec14e (diff)
downloadservo-1e9fec9172364346937f375e315e1ce745662611.tar.gz
servo-1e9fec9172364346937f375e315e1ce745662611.zip
Merge master into this branch
Diffstat (limited to 'src/components/script/script.rs')
-rw-r--r--src/components/script/script.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/components/script/script.rs b/src/components/script/script.rs
index 5d270cf2e36..1d23dfc3402 100644
--- a/src/components/script/script.rs
+++ b/src/components/script/script.rs
@@ -26,18 +26,22 @@ mod macros;
pub mod dom {
pub mod bindings {
+ pub mod js;
pub mod element;
- pub mod node;
pub mod utils;
pub mod callback;
pub mod conversions;
pub mod proxyhandler;
+ pub mod trace;
pub mod codegen {
pub use self::BindingDeclarations::*;
pub mod InterfaceTypes;
+ pub mod InheritTypes;
pub mod PrototypeList;
pub mod RegisterBindings;
pub mod BindingDeclarations;
+ pub mod UnionConversions;
+ pub mod UnionTypes;
}
}
@@ -79,7 +83,6 @@ pub mod dom {
pub mod htmldirectoryelement;
pub mod htmldivelement;
pub mod htmldlistelement;
- pub mod htmldocument;
pub mod htmlelement;
pub mod htmlembedelement;
pub mod htmlfieldsetelement;