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

~[] to std::vec::Vec in layout

Browse source
This commit is contained in:
Matt Murphy 2014-04-20 13:21:17 -05:00 • committed by Ms2ger
parent d734a8937d
commit 8da47b6a32
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/main/layout/construct.rs
View file

@ -371,7 +371,7 @@ impl<'a> FlowConstructor<'a> {
fn flush_inline_boxes_to_flow_or_list(&mut self, fn flush_inline_boxes_to_flow_or_list(&mut self,
box_accumulator: InlineBoxAccumulator, box_accumulator: InlineBoxAccumulator,
flow: &mut ~Flow:Share, flow: &mut ~Flow:Share,
flow_list: &mut ~[~Flow:Share], flow_list: &mut Vec<~Flow:Share>,
whitespace_stripping: WhitespaceStrippingMode, whitespace_stripping: WhitespaceStrippingMode,
node: &ThreadSafeLayoutNode) { node: &ThreadSafeLayoutNode) {
let mut boxes = box_accumulator.finish(); let mut boxes = box_accumulator.finish();
@ -411,7 +411,7 @@ impl<'a> FlowConstructor<'a> {
fn build_block_flow_using_children_construction_result(&mut self, fn build_block_flow_using_children_construction_result(&mut self,
flow: &mut ~Flow:Share, flow: &mut ~Flow:Share,
consecutive_siblings: consecutive_siblings:
&mut ~[~Flow:Share], &mut Vec<~Flow:Share>,
node: &ThreadSafeLayoutNode, node: &ThreadSafeLayoutNode,
kid: ThreadSafeLayoutNode, kid: ThreadSafeLayoutNode,
inline_box_accumulator: inline_box_accumulator:
@ -450,7 +450,7 @@ impl<'a> FlowConstructor<'a> {
whitespace_stripping, whitespace_stripping,
node); node);
if !consecutive_siblings.is_empty() { if !consecutive_siblings.is_empty() {
let consecutive_siblings = mem::replace(consecutive_siblings, ~[]); let consecutive_siblings = mem::replace(consecutive_siblings, Vec::new());
self.generate_anonymous_missing_child(consecutive_siblings, self.generate_anonymous_missing_child(consecutive_siblings,
flow, flow,
node); node);
@ -536,7 +536,7 @@ impl<'a> FlowConstructor<'a> {
-> ConstructionResult { -> ConstructionResult {
// Gather up boxes for the inline flows we might need to create. // Gather up boxes for the inline flows we might need to create.
let mut inline_box_accumulator = InlineBoxAccumulator::new(); let mut inline_box_accumulator = InlineBoxAccumulator::new();
let mut consecutive_siblings = ~[]; let mut consecutive_siblings = Vec::new();
let mut first_box = true; let mut first_box = true;
// List of absolute descendants, in tree order. // List of absolute descendants, in tree order.
@ -755,11 +755,11 @@ impl<'a> FlowConstructor<'a> {
/// Generates an anonymous table flow according to CSS 2.1 § 17.2.1, step 2. /// Generates an anonymous table flow according to CSS 2.1 § 17.2.1, step 2.
/// If necessary, generate recursively another anonymous table flow. /// If necessary, generate recursively another anonymous table flow.
fn generate_anonymous_missing_child(&mut self, fn generate_anonymous_missing_child(&mut self,
child_flows: ~[~Flow:Share], child_flows: Vec<~Flow:Share>,
flow: &mut ~Flow:Share, flow: &mut ~Flow:Share,
node: &ThreadSafeLayoutNode) { node: &ThreadSafeLayoutNode) {
let mut anonymous_flow = flow.generate_missing_child_flow(node); let mut anonymous_flow = flow.generate_missing_child_flow(node);
let mut consecutive_siblings = ~[]; let mut consecutive_siblings = Vec::new();
for kid_flow in child_flows.move_iter() { for kid_flow in child_flows.move_iter() {
if anonymous_flow.need_anonymous_flow(kid_flow) { if anonymous_flow.need_anonymous_flow(kid_flow) {
consecutive_siblings.push(kid_flow); consecutive_siblings.push(kid_flow);
@ -767,7 +767,7 @@ impl<'a> FlowConstructor<'a> {
} }
if !consecutive_siblings.is_empty() { if !consecutive_siblings.is_empty() {
self.generate_anonymous_missing_child(consecutive_siblings, &mut anonymous_flow, node); self.generate_anonymous_missing_child(consecutive_siblings, &mut anonymous_flow, node);
consecutive_siblings = ~[]; consecutive_siblings = Vec::new();
} }
anonymous_flow.add_new_child(kid_flow); anonymous_flow.add_new_child(kid_flow);
} }
@ -879,7 +879,7 @@ impl<'a> FlowConstructor<'a> {
fn build_flow_for_table_colgroup(&mut self, node: &ThreadSafeLayoutNode) -> ConstructionResult { fn build_flow_for_table_colgroup(&mut self, node: &ThreadSafeLayoutNode) -> ConstructionResult {
let box_ = Box::new_from_specific_info(node, let box_ = Box::new_from_specific_info(node,
TableColumnBox(TableColumnBoxInfo::new(node))); TableColumnBox(TableColumnBoxInfo::new(node)));
let mut col_boxes = ~[]; let mut col_boxes = Vec::new();
for kid in node.children() { for kid in node.children() {
// CSS 2.1 § 17.2.1. Treat all non-column child boxes of `table-column-group` // CSS 2.1 § 17.2.1. Treat all non-column child boxes of `table-column-group`
// as `display: none`. // as `display: none`.

6
src/components/main/layout/table_colgroup.rs
View file

@ -20,7 +20,7 @@ pub struct TableColGroupFlow {
pub box_: Option<Box>, pub box_: Option<Box>,
/// The table column boxes /// The table column boxes
pub cols: ~[Box], pub cols: Vec<Box>,
/// The specified widths of table columns /// The specified widths of table columns
pub widths: ~[Au], pub widths: ~[Au],
@ -29,7 +29,7 @@ pub struct TableColGroupFlow {
impl TableColGroupFlow { impl TableColGroupFlow {
pub fn from_node_and_boxes(node: &ThreadSafeLayoutNode, pub fn from_node_and_boxes(node: &ThreadSafeLayoutNode,
box_: Box, box_: Box,
boxes: ~[Box]) -> TableColGroupFlow { boxes: Vec<Box>) -> TableColGroupFlow {
TableColGroupFlow { TableColGroupFlow {
base: BaseFlow::new((*node).clone()), base: BaseFlow::new((*node).clone()),
box_: Some(box_), box_: Some(box_),
@ -43,7 +43,7 @@ impl TableColGroupFlow {
box_.teardown(); box_.teardown();
} }
self.box_ = None; self.box_ = None;
self.cols = ~[]; self.cols = Vec::new();
self.widths = ~[]; self.widths = ~[];
} }
} }