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

Remove InlineFragmentMap

Browse source
This commit is contained in:
Brendan Zabarauskas 2014-06-02 14:30:07 -07:00
parent fe8e0ac06f
commit 782608eba5
1 changed files with 24 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/components/main/layout/inline.rs
View file

@ -631,7 +631,7 @@ impl LineBreaker {
/// Iterator over fragments. /// Iterator over fragments.
pub struct FragmentIterator<'a> { pub struct FragmentIterator<'a> {
iter: Enumerate<Items<'a,Fragment>>, iter: Enumerate<Items<'a,Fragment>>,
map: &'a InlineFragmentMap, ranges: &'a Vec<InlineFragmentRange>,
} }
impl<'a> Iterator<(&'a Fragment, InlineFragmentContext<'a>)> for FragmentIterator<'a> { impl<'a> Iterator<(&'a Fragment, InlineFragmentContext<'a>)> for FragmentIterator<'a> {
@ -641,7 +641,7 @@ impl<'a> Iterator<(&'a Fragment, InlineFragmentContext<'a>)> for FragmentIterato
None => None, None => None,
Some((i, fragment)) => Some(( Some((i, fragment)) => Some((
fragment, fragment,
InlineFragmentContext::new(self.map, FragmentIndex(i as int)), InlineFragmentContext::new(self.ranges, FragmentIndex(i as int)),
)), )),
} }
} }
@ -650,7 +650,7 @@ impl<'a> Iterator<(&'a Fragment, InlineFragmentContext<'a>)> for FragmentIterato
/// Mutable iterator over fragments. /// Mutable iterator over fragments.
pub struct MutFragmentIterator<'a> { pub struct MutFragmentIterator<'a> {
iter: Enumerate<MutItems<'a,Fragment>>, iter: Enumerate<MutItems<'a,Fragment>>,
map: &'a InlineFragmentMap, ranges: &'a Vec<InlineFragmentRange>,
} }
impl<'a> Iterator<(&'a mut Fragment, InlineFragmentContext<'a>)> for MutFragmentIterator<'a> { impl<'a> Iterator<(&'a mut Fragment, InlineFragmentContext<'a>)> for MutFragmentIterator<'a> {
@ -660,7 +660,7 @@ impl<'a> Iterator<(&'a mut Fragment, InlineFragmentContext<'a>)> for MutFragment
None => None, None => None,
Some((i, fragment)) => Some(( Some((i, fragment)) => Some((
fragment, fragment,
InlineFragmentContext::new(self.map, FragmentIndex(i as int)), InlineFragmentContext::new(self.ranges, FragmentIndex(i as int)),
)), )),
} }
} }
@ -670,16 +670,17 @@ impl<'a> Iterator<(&'a mut Fragment, InlineFragmentContext<'a>)> for MutFragment
pub struct InlineFragments { pub struct InlineFragments {
/// The fragments themselves. /// The fragments themselves.
pub fragments: Vec<Fragment>, pub fragments: Vec<Fragment>,
/// Tracks the elements that made up the fragments above. /// Tracks the elements that made up the fragments above. This is used to
pub map: InlineFragmentMap, /// recover the DOM structure from the `fragments` when it's needed.
pub ranges: Vec<InlineFragmentRange>,
} }
impl InlineFragments { impl InlineFragments {
/// Creates an empty set of inline fragments. /// Creates an empty set of inline fragments.
pub fn new() -> InlineFragments { pub fn new() -> InlineFragments {
InlineFragments { InlineFragments {
fragments: Vec::new(), fragments: vec![],
map: InlineFragmentMap::new(), ranges: vec![],
} }
} }
@ -695,7 +696,7 @@ impl InlineFragments {
/// Pushes a new inline fragment. /// Pushes a new inline fragment.
pub fn push(&mut self, fragment: Fragment, style: Arc<ComputedValues>) { pub fn push(&mut self, fragment: Fragment, style: Arc<ComputedValues>) {
self.map.list.push(InlineFragmentRange::new( self.ranges.push(InlineFragmentRange::new(
style, Range::new(FragmentIndex(self.fragments.len() as int), FragmentIndex(1)), style, Range::new(FragmentIndex(self.fragments.len() as int), FragmentIndex(1)),
)); ));
self.fragments.push(fragment) self.fragments.push(fragment)
@ -705,10 +706,10 @@ impl InlineFragments {
pub fn push_all(&mut self, other: InlineFragments) { pub fn push_all(&mut self, other: InlineFragments) {
let InlineFragments { let InlineFragments {
fragments: other_fragments, fragments: other_fragments,
map: other_map ranges: other_ranges,
} = other; } = other;
let adjustment = FragmentIndex(self.fragments.len() as int); let adjustment = FragmentIndex(self.fragments.len() as int);
self.push_all_ranges(other_map, adjustment); self.push_all_ranges(other_ranges, adjustment);
self.fragments.push_all_move(other_fragments); self.fragments.push_all_move(other_fragments);
} }
@ -716,7 +717,7 @@ impl InlineFragments {
pub fn iter<'a>(&'a self) -> FragmentIterator<'a> { pub fn iter<'a>(&'a self) -> FragmentIterator<'a> {
FragmentIterator { FragmentIterator {
iter: self.fragments.as_slice().iter().enumerate(), iter: self.fragments.as_slice().iter().enumerate(),
map: &self.map, ranges: &self.ranges,
} }
} }
@ -725,7 +726,7 @@ impl InlineFragments {
pub fn mut_iter<'a>(&'a mut self) -> MutFragmentIterator<'a> { pub fn mut_iter<'a>(&'a mut self) -> MutFragmentIterator<'a> {
MutFragmentIterator { MutFragmentIterator {
iter: self.fragments.as_mut_slice().mut_iter().enumerate(), iter: self.fragments.as_mut_slice().mut_iter().enumerate(),
map: &self.map, ranges: &self.ranges,
} }
} }
@ -741,16 +742,12 @@ impl InlineFragments {
/// Adds the given node to the fragment map. /// Adds the given node to the fragment map.
pub fn push_range(&mut self, style: Arc<ComputedValues>, range: Range<FragmentIndex>) { pub fn push_range(&mut self, style: Arc<ComputedValues>, range: Range<FragmentIndex>) {
self.map.list.push(InlineFragmentRange::new(style, range)) self.ranges.push(InlineFragmentRange::new(style, range))
} }
/// Pushes the ranges in a fragment map, adjusting indices as necessary. /// Pushes the ranges in a fragment map, adjusting indices as necessary.
fn push_all_ranges(&mut self, other: InlineFragmentMap, adjustment: FragmentIndex) { fn push_all_ranges(&mut self, ranges: Vec<InlineFragmentRange>, adjustment: FragmentIndex) {
let InlineFragmentMap { for other_range in ranges.move_iter() {
list: other_list
} = other;
for other_range in other_list.move_iter() {
let InlineFragmentRange { let InlineFragmentRange {
style: other_style, style: other_style,
range: mut other_range range: mut other_range
@ -763,7 +760,7 @@ impl InlineFragments {
/// Returns the range with the given index. /// Returns the range with the given index.
pub fn get_mut_range<'a>(&'a mut self, index: FragmentIndex) -> &'a mut InlineFragmentRange { pub fn get_mut_range<'a>(&'a mut self, index: FragmentIndex) -> &'a mut InlineFragmentRange {
self.map.list.get_mut(index.to_uint()) self.ranges.get_mut(index.to_uint())
} }
/// Rebuilds the list after the fragments have been split or deleted (for example, for line /// Rebuilds the list after the fragments have been split or deleted (for example, for line
@ -777,7 +774,7 @@ impl InlineFragments {
/// needlessly has to clone fragments. /// needlessly has to clone fragments.
pub fn fixup(&mut self, new_fragments: Vec<Fragment>) { pub fn fixup(&mut self, new_fragments: Vec<Fragment>) {
// TODO(pcwalton): Post Rust upgrade, use `with_capacity` here. // TODO(pcwalton): Post Rust upgrade, use `with_capacity` here.
let old_list = mem::replace(&mut self.map.list, vec![]); let old_list = mem::replace(&mut self.ranges, vec![]);
let mut worklist = vec![]; // FIXME(#2269, pcwalton): was smallvec4 let mut worklist = vec![]; // FIXME(#2269, pcwalton): was smallvec4
let mut old_list_iter = old_list.move_iter().peekable(); let mut old_list_iter = old_list.move_iter().peekable();
@ -864,7 +861,7 @@ impl InlineFragments {
.. ..
} = worklist.pop().unwrap(); } = worklist.pop().unwrap();
let range = Range::new(new_start_index, new_last_index - new_start_index); let range = Range::new(new_start_index, new_last_index - new_start_index);
self.map.list.push(InlineFragmentRange::new(style, range)) self.ranges.push(InlineFragmentRange::new(style, range))
} }
} }
} }
@ -1386,32 +1383,17 @@ impl<'a> Iterator<&'a InlineFragmentRange> for RangeIterator<'a> {
} }
} }
/// Information that inline flows keep about nested elements. This is used to recover the DOM
/// structure from the flat fragment list when it's needed.
pub struct InlineFragmentMap {
list: Vec<InlineFragmentRange>,
}
impl InlineFragmentMap {
/// Creates a new fragment map.
pub fn new() -> InlineFragmentMap {
InlineFragmentMap {
list: Vec::new(),
}
}
}
/// The context that an inline fragment appears in. This allows the fragment map to be passed in /// The context that an inline fragment appears in. This allows the fragment map to be passed in
/// conveniently to various fragment functions. /// conveniently to various fragment functions.
pub struct InlineFragmentContext<'a> { pub struct InlineFragmentContext<'a> {
map: &'a InlineFragmentMap, ranges: &'a Vec<InlineFragmentRange>,
index: FragmentIndex, index: FragmentIndex,
} }
impl<'a> InlineFragmentContext<'a> { impl<'a> InlineFragmentContext<'a> {
pub fn new<'a>(map: &'a InlineFragmentMap, index: FragmentIndex) -> InlineFragmentContext<'a> { pub fn new<'a>(ranges: &'a Vec<InlineFragmentRange>, index: FragmentIndex) -> InlineFragmentContext<'a> {
InlineFragmentContext { InlineFragmentContext {
map: map, ranges: ranges,
index: index, index: index,
} }
} }
@ -1420,7 +1402,7 @@ impl<'a> InlineFragmentContext<'a> {
#[inline(always)] #[inline(always)]
pub fn ranges(&self) -> RangeIterator<'a> { pub fn ranges(&self) -> RangeIterator<'a> {
RangeIterator { RangeIterator {
iter: self.map.list.iter(), iter: self.ranges.iter(),
index: self.index, index: self.index,
seen_first: false, seen_first: false,
} }