diff --git a/components/layout_2020/flow/inline.rs b/components/layout_2020/flow/inline.rs index ff8f6c8a02d..6bf88502d4a 100644 --- a/components/layout_2020/flow/inline.rs +++ b/components/layout_2020/flow/inline.rs @@ -2215,7 +2215,7 @@ struct ContentSizesComputation<'a> { paragraph: ContentSizes, current_line: ContentSizes, /// Size for whitepsace pending to be added to this line. - pending_whitespace: Length, + pending_whitespace: Au, /// Whether or not this IFC has seen any non-whitespace content. had_non_whitespace_content_yet: bool, /// Stack of ending padding, margin, and border to add to the length @@ -2270,14 +2270,13 @@ impl<'a> ContentSizesComputation<'a> { } for run in segment.runs.iter() { - let advance = Length::from(run.glyph_store.total_advance()); + let advance = run.glyph_store.total_advance(); if !run.glyph_store.is_whitespace() { self.had_non_whitespace_content_yet = true; - self.current_line.min_content += advance.into(); - self.current_line.max_content += - (self.pending_whitespace + advance).into(); - self.pending_whitespace = Length::zero(); + self.current_line.min_content += advance; + self.current_line.max_content += self.pending_whitespace + advance; + self.pending_whitespace = Au::zero(); } else { // If this run is a forced line break, we *must* break the line // and start measuring from the inline origin once more. @@ -2307,10 +2306,9 @@ impl<'a> ContentSizesComputation<'a> { self.containing_block_writing_mode, ); - self.current_line.min_content += - (self.pending_whitespace + outer.min_content.into()).into(); - self.current_line.max_content += outer.max_content; - self.pending_whitespace = Length::zero(); + self.current_line.min_content += self.pending_whitespace + outer.min_content; + self.current_line.max_content += self.pending_whitespace + outer.max_content; + self.pending_whitespace = Au::zero(); self.had_non_whitespace_content_yet = true; }, _ => {}, @@ -2349,7 +2347,7 @@ impl<'a> ContentSizesComputation<'a> { containing_block_writing_mode, paragraph: ContentSizes::zero(), current_line: ContentSizes::zero(), - pending_whitespace: Length::zero(), + pending_whitespace: Au::zero(), had_non_whitespace_content_yet: false, ending_inline_pbm_stack: Vec::new(), } diff --git a/tests/wpt/meta/css/CSS2/tables/table-anonymous-objects-118.xht.ini b/tests/wpt/meta/css/CSS2/tables/table-anonymous-objects-118.xht.ini deleted file mode 100644 index 5d2b1fcfd1f..00000000000 --- a/tests/wpt/meta/css/CSS2/tables/table-anonymous-objects-118.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-anonymous-objects-118.xht] - expected: FAIL diff --git a/tests/wpt/meta/css/CSS2/tables/table-anonymous-objects-120.xht.ini b/tests/wpt/meta/css/CSS2/tables/table-anonymous-objects-120.xht.ini deleted file mode 100644 index a7508bb58ab..00000000000 --- a/tests/wpt/meta/css/CSS2/tables/table-anonymous-objects-120.xht.ini +++ /dev/null @@ -1,2 +0,0 @@ -[table-anonymous-objects-120.xht] - expected: FAIL diff --git a/tests/wpt/meta/css/css-flexbox/percentage-size-quirks-002.html.ini b/tests/wpt/meta/css/css-flexbox/percentage-size-quirks-002.html.ini index f190b3697e6..6a1c4d88cd7 100644 --- a/tests/wpt/meta/css/css-flexbox/percentage-size-quirks-002.html.ini +++ b/tests/wpt/meta/css/css-flexbox/percentage-size-quirks-002.html.ini @@ -1,6 +1,3 @@ [percentage-size-quirks-002.html] [.pct 2] expected: FAIL - - [.pct 1] - expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/width-distribution/td-with-subpixel-padding-vertical-rl.html.ini b/tests/wpt/meta/css/css-tables/width-distribution/td-with-subpixel-padding-vertical-rl.html.ini new file mode 100644 index 00000000000..db13f7eda90 --- /dev/null +++ b/tests/wpt/meta/css/css-tables/width-distribution/td-with-subpixel-padding-vertical-rl.html.ini @@ -0,0 +1,3 @@ +[td-with-subpixel-padding-vertical-rl.html] + [td-with-subpixel-padding-vertical-rl] + expected: FAIL diff --git a/tests/wpt/meta/css/css-tables/width-distribution/td-with-subpixel-padding.html.ini b/tests/wpt/meta/css/css-tables/width-distribution/td-with-subpixel-padding.html.ini deleted file mode 100644 index 8ea807bd586..00000000000 --- a/tests/wpt/meta/css/css-tables/width-distribution/td-with-subpixel-padding.html.ini +++ /dev/null @@ -1,3 +0,0 @@ -[td-with-subpixel-padding.html] - [td-with-subpixel-padding] - expected: FAIL