aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/components/main/layout/layout_task.rs4
-rw-r--r--src/components/script/dom/node.rs4
-rw-r--r--src/components/script/layout_interface.rs2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/components/main/layout/layout_task.rs b/src/components/main/layout/layout_task.rs
index 1652365f93b..1a9b685a2a8 100644
--- a/src/components/main/layout/layout_task.rs
+++ b/src/components/main/layout/layout_task.rs
@@ -754,7 +754,7 @@ impl LayoutTask {
ContentBoxesQuery(node, reply_chan) => {
let node: OpaqueNode = OpaqueNodeMethods::from_script_node(node);
- fn add_boxes_for_node(accumulator: &mut ~[Rect<Au>],
+ fn add_boxes_for_node(accumulator: &mut Vec<Rect<Au>>,
mut iter: DisplayItemIterator,
node: OpaqueNode) {
for item in iter {
@@ -765,7 +765,7 @@ impl LayoutTask {
}
}
- let mut boxes = ~[];
+ let mut boxes = vec!();
match self.display_list {
None => fail!("no display list!"),
Some(ref display_list) => {
diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs
index 37cc1553324..d5e4654e254 100644
--- a/src/components/script/dom/node.rs
+++ b/src/components/script/dom/node.rs
@@ -288,7 +288,7 @@ pub trait NodeHelpers {
fn to_trusted_node_address(&self) -> TrustedNodeAddress;
fn get_bounding_content_box(&self) -> Rect<Au>;
- fn get_content_boxes(&self) -> ~[Rect<Au>];
+ fn get_content_boxes(&self) -> Vec<Rect<Au>>;
}
impl NodeHelpers for JS<Node> {
@@ -581,7 +581,7 @@ impl NodeHelpers for JS<Node> {
rect
}
- fn get_content_boxes(&self) -> ~[Rect<Au>] {
+ fn get_content_boxes(&self) -> Vec<Rect<Au>> {
let window = window_from_node(self);
let page = window.get().page();
let (chan, port) = channel();
diff --git a/src/components/script/layout_interface.rs b/src/components/script/layout_interface.rs
index 9249d39b051..876d37f43af 100644
--- a/src/components/script/layout_interface.rs
+++ b/src/components/script/layout_interface.rs
@@ -83,7 +83,7 @@ impl<S: Encoder<E>, E> Encodable<S, E> for TrustedNodeAddress {
pub type UntrustedNodeAddress = *c_void;
pub struct ContentBoxResponse(pub Rect<Au>);
-pub struct ContentBoxesResponse(pub ~[Rect<Au>]);
+pub struct ContentBoxesResponse(pub Vec<Rect<Au>>);
pub struct HitTestResponse(pub UntrustedNodeAddress);
pub struct MouseOverResponse(pub Vec<UntrustedNodeAddress>);