move JS stuff out of servo into mozjs; redefine geom types to

make use of inherited mutability
servo · May 31, 2012 · 902f81c · 902f81c
1 parent cbc18b7
commit 902f81c
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 369 deletions.
diff --git a/src/rust-mozjs b/src/rust-mozjs
diff --git a/src/servo/content.rs b/src/servo/content.rs
@@ -5,7 +5,7 @@ import result::extensions;
 import dom::rcu::writer_methods;
 import dom=dom::base;
 import layout::layout;
-import js::methods;
+import js::rust::methods;
 
 enum msg {
     parse(str),
@@ -32,7 +32,7 @@ fn join_layout(scope: dom::node_scope,
 fn content(to_layout: chan<layout::msg>) -> chan<msg> {
     task::spawn_listener::<msg> {|from_master|
         let scope = dom::node_scope();
-        let rt = js::rt();
+        let rt = js::rust::rt();
         loop {
             alt from_master.recv() {
               parse(filename) {
@@ -65,8 +65,8 @@ fn content(to_layout: chan<layout::msg>) -> chan<msg> {
                     let cx = rt.cx();
                     cx.set_default_options_and_version();
                     cx.set_logging_error_reporter();
-                    cx.new_compartment(jsglobal::global_class).chain { |comp|
-                        comp.define_functions(jsglobal::global_fns);
+                    cx.new_compartment(js::global::global_class).chain { |comp|
+                        comp.define_functions(js::global::debug_fns);
                         cx.evaluate_script(comp.global_obj, bytes, filename, 1u)
                     };
                   }

diff --git a/src/servo/content/js.rs b/src/servo/content/js.rs
diff --git a/src/servo/content/jsglobal.rs b/src/servo/content/jsglobal.rs
diff --git a/src/servo/content/jsutil.rs b/src/servo/content/jsutil.rs
diff --git a/src/servo/content/name_pool.rs b/src/servo/content/name_pool.rs
diff --git a/src/servo/dom/base.rs b/src/servo/dom/base.rs
@@ -50,7 +50,7 @@ class attr {
 enum element_subclass {
     es_unknown,
     es_div,
-    es_img(size<au>),
+    es_img({mut size: size<au>}),
     es_head
 }