Skip to content

Commit

Permalink
Fix quatree test; warning police
Browse files Browse the repository at this point in the history
  • Loading branch information
eschweic committed Aug 20, 2013
1 parent 14fc16a commit c1638f8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/components/main/compositing/quadtree.rs
Expand Up @@ -750,13 +750,13 @@ pub fn test_resize() {
let mut q = Quadtree::new(6, 6, 1, None);
q.add_tile_pixel(0, 0, 1f32, T{a: 0});
q.add_tile_pixel(5, 5, 1f32, T{a: 1});
q.resize(8, 1);
q.bad_resize(8, 1);
assert!(q.root.size == 8.0);
q.resize(18, 1);
q.bad_resize(18, 1);
assert!(q.root.size == 32.0);
q.resize(8, 1);
q.bad_resize(8, 1);
assert!(q.root.size == 8.0);
q.resize(3, 1);
q.bad_resize(3, 1);
assert!(q.root.size == 4.0);
assert!(q.get_all_tiles().len() == 1);
}
Expand Down
1 change: 0 additions & 1 deletion src/components/main/constellation.rs
Expand Up @@ -27,7 +27,6 @@ use std::hashmap::{HashMap, HashSet};
use std::util::replace;
use extra::url::Url;
use extra::future::{Future, from_value};
use extra::url::Url;

/// Maintains the pipelines and navigation context and grants permission to composite
pub struct Constellation {
Expand Down

5 comments on commit c1638f8

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pcwalton
at eschweic@c1638f8

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging eschweic/servo/iframes = c1638f8 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eschweic/servo/iframes = c1638f8 merged ok, testing candidate = e4bfad1

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = e4bfad1

Please sign in to comment.