diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-18 11:25:00 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-18 11:25:00 -0600 |
| commit | 99cf9dbfc107bacb84dfe5afa9539a0ede3beac2 (patch) | |
| tree | cc36210329cb1a31709a03685c05c4aaa99407e3 /components/layout/inline.rs | |
| parent | 65d4b12bf20783ea784f1c61f4b33ec0fc975f4f (diff) | |
| parent | 5f15eb5fbfb7a8649132cc8b3a07314389836714 (diff) | |
| download | servo-99cf9dbfc107bacb84dfe5afa9539a0ede3beac2.tar.gz servo-99cf9dbfc107bacb84dfe5afa9539a0ede3beac2.zip | |
auto merge of #5256 : servo/servo/rustup_20150311, r=jdm
...v.
Relies on:
* https://github.com/servo/rust-geom/pull/72
* https://github.com/servo/rust-glx/pull/10
* https://github.com/servo/gleam/pull/15
* https://github.com/servo/rust-mozjs/pull/137
* https://github.com/servo/rust-core-text/pull/35
* https://github.com/servo/rust-io-surface/pull/28
Diffstat (limited to 'components/layout/inline.rs')
| -rw-r--r-- | components/layout/inline.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 5fb3ec9f180..97d88bb06b2 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -18,7 +18,7 @@ use layout_debug; use model::IntrinsicISizesContribution; use text; -use collections::{RingBuf}; +use collections::{VecDeque}; use geom::{Point2D, Rect}; use gfx::font::FontMetrics; use gfx::font_context::FontContext; @@ -171,7 +171,7 @@ struct LineBreaker { /// The resulting fragment list for the flow, consisting of possibly-broken fragments. new_fragments: Vec<Fragment>, /// The next fragment or fragments that we need to work on. - work_list: RingBuf<Fragment>, + work_list: VecDeque<Fragment>, /// The line we're currently working on. pending_line: Line, /// The lines we've already committed. @@ -187,7 +187,7 @@ impl LineBreaker { fn new(float_context: Floats, first_line_indentation: Au) -> LineBreaker { LineBreaker { new_fragments: Vec::new(), - work_list: RingBuf::new(), + work_list: VecDeque::new(), pending_line: Line { range: Range::empty(), bounds: LogicalRect::zero(float_context.writing_mode), @@ -513,7 +513,7 @@ impl LineBreaker { .expect("LineBreaker: this split case makes no sense!"); let writing_mode = self.floats.writing_mode; - let split_fragment = |&: split: SplitInfo| { + let split_fragment = |split: SplitInfo| { let size = LogicalSize::new(writing_mode, split.inline_size, in_fragment.border_box.size.block); @@ -1342,7 +1342,7 @@ impl Flow for InlineFlow { self.base .absolute_position_info .relative_containing_block_mode, - CoordinateSystem::Self); + CoordinateSystem::Own); let clip = fragment.clipping_region_for_children(&self.base.clip, &stacking_relative_border_box); match fragment.specific { |