Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix tests

Browse source
This commit is contained in:
Patrick Walton 2012-05-24 12:13:02 -07:00
parent c26ed2aa90
commit 02a20258d9
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/servo/layout/base.rs
View file

@ -129,8 +129,8 @@ impl node_methods for node {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
import dom::base::{nk_img, node_data, node_kind, node, methods, import dom::base::{element, es_div, es_img, methods, nk_element, node_data,
wr_tree_ops}; node_kind, node, wr_tree_ops};
import dom::rcu::scope; import dom::rcu::scope;
import box_builder::{box_builder_methods}; import box_builder::{box_builder_methods};
@ -163,10 +163,13 @@ mod test {
fn do_layout() { fn do_layout() {
let s = scope(); let s = scope();
let n0 = s.new_node(nk_img(size(au(10),au(10)))); let n0 = s.new_node(nk_element(element("img",
let n1 = s.new_node(nk_img(size(au(10),au(15)))); ~es_img(size(au(10),au(10))))));
let n2 = s.new_node(nk_img(size(au(10),au(20)))); let n1 = s.new_node(nk_element(element("img",
let n3 = s.new_node(nk_div); ~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, n0);
tree::add_child(s, n3, n1); tree::add_child(s, n3, n1);

2
src/servo/layout/inline.rs
View file

@ -4,7 +4,7 @@ import dom::rcu;
import dom::rcu::reader_methods; import dom::rcu::reader_methods;
import gfx::geom::au; import gfx::geom::au;
import /*layout::*/base::*; // FIXME: Can't get around import *; resolve bug. import /*layout::*/base::*; // FIXME: Can't get around import *; resolve bug.
import /*layout::*/style::style::style_methods; import /*layout::*/style::style::*;
import util::tree; import util::tree;
#[doc="The main reflow routine for inline layout."] #[doc="The main reflow routine for inline layout."]