aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/inline.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2015-03-03 21:16:24 +0100
committerSimon Sapin <simon.sapin@exyr.org>2015-03-03 21:16:24 +0100
commit4c1d778ced267eeef790d4166e361d9348b933d3 (patch)
treeccdd9544f8f4b7a2f6299244915584fcbf5cfc18 /components/layout/inline.rs
parent7a218b3f08c95b5c1a14ef1bbf09658d61b8d342 (diff)
downloadservo-4c1d778ced267eeef790d4166e361d9348b933d3.tar.gz
servo-4c1d778ced267eeef790d4166e361d9348b933d3.zip
Revert "layout: Implement ordered lists, CSS counters, and `quotes` per CSS 2.1"
This reverts commit 30fd28d1077fbb3f47140f6ab1252c0d24f44d23.
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r--components/layout/inline.rs22
1 files changed, 4 insertions, 18 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index 5c25d5ab00f..0a4b575c3c4 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -11,10 +11,10 @@ use floats::{FloatKind, Floats, PlacementInfo};
use flow::{BaseFlow, FlowClass, Flow, MutableFlowUtils, ForceNonfloatedFlag};
use flow::{IS_ABSOLUTELY_POSITIONED};
use flow;
-use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, FragmentMutator};
-use fragment::{ScannedTextFragmentInfo, SpecificFragmentInfo};
+use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, ScannedTextFragmentInfo};
+use fragment::{SpecificFragmentInfo};
use fragment::SplitInfo;
-use incremental::{REFLOW, REFLOW_OUT_OF_FLOW, RESOLVE_GENERATED_CONTENT};
+use incremental::{REFLOW, REFLOW_OUT_OF_FLOW};
use layout_debug;
use model::IntrinsicISizesContribution;
use text;
@@ -789,22 +789,14 @@ pub struct InlineFlow {
impl InlineFlow {
pub fn from_fragments(fragments: InlineFragments, writing_mode: WritingMode) -> InlineFlow {
- let mut flow = InlineFlow {
+ InlineFlow {
base: BaseFlow::new(None, writing_mode, ForceNonfloatedFlag::ForceNonfloated),
fragments: fragments,
lines: Vec::new(),
minimum_block_size_above_baseline: Au(0),
minimum_depth_below_baseline: Au(0),
first_line_indentation: Au(0),
- };
-
- for fragment in flow.fragments.fragments.iter() {
- if fragment.is_generated_content() {
- flow.base.restyle_damage.insert(RESOLVE_GENERATED_CONTENT)
- }
}
-
- flow
}
/// Returns the distance from the baseline for the logical block-start inline-start corner of
@@ -1399,12 +1391,6 @@ impl Flow for InlineFlow {
.translate(stacking_context_position))
}
}
-
- fn mutate_fragments(&mut self, mutator: &mut FragmentMutator) {
- for fragment in self.fragments.fragments.iter_mut() {
- mutator.process(fragment)
- }
- }
}
impl fmt::Debug for InlineFlow {