Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #3840 : pcwalton/servo/ib-splits-linked-list, r=glennw

Browse source 
r? @glennw
This commit is contained in:
bors-servo 2014-10-28 18:36:41 -06:00
commit 08288fea41
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/layout/construct.rs
View file

@ -113,7 +113,7 @@ pub enum ConstructionItem {
#[deriving(Clone)] #[deriving(Clone)]
pub struct InlineFragmentsConstructionResult { pub struct InlineFragmentsConstructionResult {
/// Any {ib} splits that we're bubbling up. /// Any {ib} splits that we're bubbling up.
pub splits: Vec<InlineBlockSplit>, pub splits: DList<InlineBlockSplit>,
/// Any fragments that succeed the {ib} splits. /// Any fragments that succeed the {ib} splits.
pub fragments: DList<Fragment>, pub fragments: DList<Fragment>,
@ -570,7 +570,7 @@ impl<'a> FlowConstructor<'a> {
/// whitespace. /// whitespace.
fn build_fragments_for_nonreplaced_inline_content(&mut self, node: &ThreadSafeLayoutNode) fn build_fragments_for_nonreplaced_inline_content(&mut self, node: &ThreadSafeLayoutNode)
-> ConstructionResult { -> ConstructionResult {
let mut opt_inline_block_splits: Vec<InlineBlockSplit> = Vec::new(); let mut opt_inline_block_splits: DList<InlineBlockSplit> = DList::new();
let mut fragment_accumulator = InlineFragmentsAccumulator::from_inline_node(node); let mut fragment_accumulator = InlineFragmentsAccumulator::from_inline_node(node);
let mut abs_descendants = Descendants::new(); let mut abs_descendants = Descendants::new();
@ -692,7 +692,7 @@ impl<'a> FlowConstructor<'a> {
fragments.push(fragment); fragments.push(fragment);
let construction_item = InlineFragmentsConstructionItem(InlineFragmentsConstructionResult { let construction_item = InlineFragmentsConstructionItem(InlineFragmentsConstructionResult {
splits: Vec::new(), splits: DList::new(),
fragments: fragments, fragments: fragments,
abs_descendants: Descendants::new(), abs_descendants: Descendants::new(),
}); });
@ -714,7 +714,7 @@ impl<'a> FlowConstructor<'a> {
fragment_accumulator.fragments.push(fragment); fragment_accumulator.fragments.push(fragment);
let construction_item = InlineFragmentsConstructionItem(InlineFragmentsConstructionResult { let construction_item = InlineFragmentsConstructionItem(InlineFragmentsConstructionResult {
splits: Vec::new(), splits: DList::new(),
fragments: fragment_accumulator.to_dlist(), fragments: fragment_accumulator.to_dlist(),
abs_descendants: abs_descendants, abs_descendants: abs_descendants,
}); });
@ -739,7 +739,7 @@ impl<'a> FlowConstructor<'a> {
fragment_accumulator.fragments.push(fragment); fragment_accumulator.fragments.push(fragment);
let construction_item = InlineFragmentsConstructionItem(InlineFragmentsConstructionResult { let construction_item = InlineFragmentsConstructionItem(InlineFragmentsConstructionResult {
splits: Vec::new(), splits: DList::new(),
fragments: fragment_accumulator.to_dlist(), fragments: fragment_accumulator.to_dlist(),
abs_descendants: abs_descendants, abs_descendants: abs_descendants,
}); });