diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2012-05-24 12:13:02 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2012-05-24 12:13:02 -0700 |
| commit | 02a20258d9a085b74b00632679c806fb2699875f (patch) | |
| tree | 64fa1f2b63a8c2753e902b998feb9a12ff13bf93 | |
| parent | c26ed2aa9023a1ef29d64d81e0aca6219a8e6f73 (diff) | |
| download | servo-02a20258d9a085b74b00632679c806fb2699875f.tar.gz servo-02a20258d9a085b74b00632679c806fb2699875f.zip | |
Fix tests
| -rw-r--r-- | src/servo/layout/base.rs | 15 | ||||
| -rw-r--r-- | src/servo/layout/inline.rs | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/servo/layout/base.rs b/src/servo/layout/base.rs index 2db6ec6d02c..0dc3474ca88 100644 --- a/src/servo/layout/base.rs +++ b/src/servo/layout/base.rs @@ -129,8 +129,8 @@ impl node_methods for node { #[cfg(test)] mod test { - import dom::base::{nk_img, node_data, node_kind, node, methods, - wr_tree_ops}; + import dom::base::{element, es_div, es_img, methods, nk_element, node_data, + node_kind, node, wr_tree_ops}; import dom::rcu::scope; import box_builder::{box_builder_methods}; @@ -163,10 +163,13 @@ mod test { fn do_layout() { let s = scope(); - let n0 = s.new_node(nk_img(size(au(10),au(10)))); - let n1 = s.new_node(nk_img(size(au(10),au(15)))); - let n2 = s.new_node(nk_img(size(au(10),au(20)))); - let n3 = s.new_node(nk_div); + let n0 = s.new_node(nk_element(element("img", + ~es_img(size(au(10),au(10)))))); + let n1 = s.new_node(nk_element(element("img", + ~es_img(size(au(10),au(15)))))); + let n2 = s.new_node(nk_element(element("img", + ~es_img(size(au(10),au(20)))))); + let n3 = s.new_node(nk_element(element("div", ~es_div))); tree::add_child(s, n3, n0); tree::add_child(s, n3, n1); diff --git a/src/servo/layout/inline.rs b/src/servo/layout/inline.rs index 37cd11c0b24..029930ade7b 100644 --- a/src/servo/layout/inline.rs +++ b/src/servo/layout/inline.rs @@ -4,7 +4,7 @@ import dom::rcu; import dom::rcu::reader_methods; import gfx::geom::au; import /*layout::*/base::*; // FIXME: Can't get around import *; resolve bug. -import /*layout::*/style::style::style_methods; +import /*layout::*/style::style::*; import util::tree; #[doc="The main reflow routine for inline layout."] |