Auto merge of #13490 - pcwalton:inline-absolute-hypothetical-metrics, r=notriddle

layout: Place inline absolute hypothetical boxes properly during block fragment position assignment.

r? @notriddle

Closes #13471.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13490)
<!-- Reviewable:end -->

38 files changed, 231 insertions, 156 deletions

diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index 698ed517772..a6f3e92f1be 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -2044,7 +2044,7 @@ impl Fragment {
     /// Calculates block-size above baseline, depth below baseline, and ascent for this fragment
     /// when used in an inline formatting context. See CSS 2.1 § 10.8.1.
     pub fn inline_metrics(&self, layout_context: &LayoutContext) -> InlineMetrics {
-        match self.specific {
+        return match self.specific {
             SpecificFragmentInfo::Image(ref image_fragment_info) => {
                 let computed_block_size = image_fragment_info.replaced_image_fragment_info
                                                              .computed_block_size();
@@ -2082,30 +2082,13 @@ impl Fragment {
                 }
             }
             SpecificFragmentInfo::InlineBlock(ref info) => {
-                // See CSS 2.1 § 10.8.1.
-                let flow = &info.flow_ref;
-                let block_flow = flow.as_block();
-                let is_auto = self.style.get_position().height == LengthOrPercentageOrAuto::Auto;
-                let baseline_offset = match flow.baseline_offset_of_last_line_box_in_flow() {
-                    Some(baseline_offset) if is_auto => baseline_offset,
-                    _ => block_flow.fragment.border_box.size.block,
-                };
-                let start_margin = block_flow.fragment.margin.block_start;
-                let end_margin = block_flow.fragment.margin.block_end;
-                let depth_below_baseline = flow::base(&**flow).position.size.block -
-                    baseline_offset + end_margin;
-                InlineMetrics::new(baseline_offset + start_margin,
-                                   depth_below_baseline,
-                                   baseline_offset)
+                inline_metrics_of_block(&info.flow_ref, &*self.style)
+            }
+            SpecificFragmentInfo::InlineAbsoluteHypothetical(ref info) => {
+                inline_metrics_of_block(&info.flow_ref, &*self.style)
             }
-            SpecificFragmentInfo::InlineAbsoluteHypothetical(_) |
             SpecificFragmentInfo::InlineAbsolute(_) => {
-                // Hypothetical boxes take up no space.
-                InlineMetrics {
-                    block_size_above_baseline: Au(0),
-                    depth_below_baseline: Au(0),
-                    ascent: Au(0),
-                }
+                InlineMetrics::new(Au(0), Au(0), Au(0))
             }
             _ => {
                 InlineMetrics {
@@ -2114,6 +2097,23 @@ impl Fragment {
                     ascent: self.border_box.size.block,
                 }
             }
+        };
+
+        fn inline_metrics_of_block(flow: &FlowRef, style: &ServoComputedValues) -> InlineMetrics {
+            // See CSS 2.1 § 10.8.1.
+            let block_flow = flow.as_block();
+            let is_auto = style.get_position().height == LengthOrPercentageOrAuto::Auto;
+            let baseline_offset = flow.baseline_offset_of_last_line_box_in_flow();
+            let baseline_offset = match baseline_offset {
+                Some(baseline_offset) if is_auto => baseline_offset,
+                _ => block_flow.fragment.border_box.size.block,
+            };
+            let start_margin = block_flow.fragment.margin.block_start;
+            let end_margin = block_flow.fragment.margin.block_end;
+            let block_size_above_baseline = baseline_offset + start_margin;
+            let depth_below_baseline = flow::base(&**flow).position.size.block - baseline_offset +
+                end_margin;
+            InlineMetrics::new(block_size_above_baseline, depth_below_baseline, baseline_offset)
         }
     }
 
@@ -2932,3 +2932,4 @@ impl Encodable for DebugId {
         e.emit_u16(self.0)
     }
 }
+
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index fb47f647a34..f0622f1bbcb 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -158,6 +158,12 @@ pub struct Line {
     /// ~~~
     pub green_zone: LogicalSize<Au>,
 
+    /// The minimum block size above the baseline for this line, as specified by the style.
+    pub minimum_block_size_above_baseline: Au,
+
+    /// The minimum depth below the baseline for this line, as specified by the style.
+    pub minimum_depth_below_baseline: Au,
+
     /// The inline metrics for this line.
     pub inline_metrics: InlineMetrics,
 }
@@ -172,11 +178,44 @@ impl Line {
             visual_runs: None,
             bounds: LogicalRect::zero(writing_mode),
             green_zone: LogicalSize::zero(writing_mode),
+            minimum_block_size_above_baseline: minimum_block_size_above_baseline,
+            minimum_depth_below_baseline: minimum_depth_below_baseline,
             inline_metrics: InlineMetrics::new(minimum_block_size_above_baseline,
                                                minimum_depth_below_baseline,
                                                minimum_block_size_above_baseline),
         }
     }
+
+    /// Returns the new metrics that this line would have if `new_fragment` were added to it.
+    ///
+    /// FIXME(pcwalton): this assumes that the tallest fragment in the line determines the line
+    /// block-size. This might not be the case with some weird text fonts.
+    fn new_inline_metrics(&self, new_fragment: &Fragment, layout_context: &LayoutContext)
+                          -> InlineMetrics {
+        if !new_fragment.is_vertically_aligned_to_top_or_bottom() {
+            let fragment_inline_metrics = new_fragment.inline_metrics(layout_context);
+            self.inline_metrics.max(&fragment_inline_metrics)
+        } else {
+            self.inline_metrics
+        }
+    }
+
+    /// Returns the new block size that this line would have if `new_fragment` were added to it.
+    /// `new_inline_metrics` represents the new inline metrics that this line would have; it can
+    /// be computed with `new_inline_metrics()`.
+    fn new_block_size(&self,
+                      new_fragment: &Fragment,
+                      new_inline_metrics: &InlineMetrics,
+                      layout_context: &LayoutContext)
+                      -> Au {
+        let new_block_size = if new_fragment.is_vertically_aligned_to_top_or_bottom() {
+            max(new_fragment.inline_metrics(layout_context).block_size(),
+                self.minimum_block_size_above_baseline + self.minimum_depth_below_baseline)
+        } else {
+            new_inline_metrics.block_size()
+        };
+        max(self.bounds.size.block, new_block_size)
+    }
 }
 
 int_range_index! {
@@ -406,29 +445,6 @@ impl LineBreaker {
             fragment.border_box.size.inline - old_fragment_inline_size;
     }
 
-    // FIXME(eatkinson): this assumes that the tallest fragment in the line determines the line
-    // block-size. This might not be the case with some weird text fonts.
-    fn new_inline_metrics_for_line(&self, new_fragment: &Fragment, layout_context: &LayoutContext)
-                                   -> InlineMetrics {
-        if !new_fragment.is_vertically_aligned_to_top_or_bottom() {
-            let fragment_inline_metrics = new_fragment.inline_metrics(layout_context);
-            self.pending_line.inline_metrics.max(&fragment_inline_metrics)
-        } else {
-            self.pending_line.inline_metrics
-        }
-    }
-
-    fn new_block_size_for_line(&self, new_fragment: &Fragment, layout_context: &LayoutContext)
-                               -> Au {
-        let new_block_size = if new_fragment.is_vertically_aligned_to_top_or_bottom() {
-            max(new_fragment.inline_metrics(layout_context).block_size(),
-                self.minimum_block_size_above_baseline + self.minimum_depth_below_baseline)
-        } else {
-            self.new_inline_metrics_for_line(new_fragment, layout_context).block_size()
-        };
-        max(self.pending_line.bounds.size.block, new_block_size)
-    }
-
     /// Computes the position of a line that has only the provided fragment. Returns the bounding
     /// rect of the line's green zone (whose origin coincides with the line's origin) and the
     /// actual inline-size of the first fragment after splitting.
@@ -558,7 +574,10 @@ impl LineBreaker {
         // `green_zone.block < self.pending_line.bounds.size.block`, then we committed a line that
         // overlaps with floats.
         let green_zone = self.pending_line.green_zone;
-        let new_block_size = self.new_block_size_for_line(&fragment, layout_context);
+        let new_inline_metrics = self.pending_line.new_inline_metrics(&fragment, layout_context);
+        let new_block_size = self.pending_line.new_block_size(&fragment,
+                                                              &new_inline_metrics,
+                                                              layout_context);
         if new_block_size > green_zone.block {
             // Uh-oh. Float collision imminent. Enter the float collision avoider!
             if !self.avoid_floats(flow, fragment, new_block_size) {
@@ -726,14 +745,16 @@ impl LineBreaker {
         let indentation = self.indentation_for_pending_fragment();
         self.pending_line.range.extend_by(FragmentIndex(1));
 
-        if !fragment.is_inline_absolute() {
+        if !fragment.is_inline_absolute() && !fragment.is_hypothetical() {
             self.pending_line.bounds.size.inline = self.pending_line.bounds.size.inline +
                 fragment.margin_box_inline_size() +
                 indentation;
             self.pending_line.inline_metrics =
-                self.new_inline_metrics_for_line(&fragment, layout_context);
+                self.pending_line.new_inline_metrics(&fragment, layout_context);
             self.pending_line.bounds.size.block =
-                self.new_block_size_for_line(&fragment, layout_context);
+                self.pending_line.new_block_size(&fragment,
+                                                 &self.pending_line.inline_metrics,
+                                                 layout_context);
         }
 
         self.new_fragments.push(fragment);
@@ -1040,8 +1061,9 @@ impl InlineFlow {
             // to do.
             let fragment = fragments.get_mut(fragment_index.to_usize());
             let fragment_inline_metrics = fragment.inline_metrics(layout_context);
-            let mut block_start = line.bounds.start.b +
-                line.inline_metrics.block_size_above_baseline -
+            let line_block_metrics = LineBlockMetrics::new(line, fragment, layout_context);
+            let mut block_start = line_block_metrics.start +
+                line_block_metrics.size_above_baseline -
                 fragment_inline_metrics.ascent;
 
             for style in fragment.inline_styles() {
@@ -1061,21 +1083,21 @@ impl InlineFlow {
                         block_start = block_start - super_offset
                     }
                     vertical_align::T::text_top => {
-                        block_start = line.bounds.start.b +
-                            line.inline_metrics.block_size_above_baseline -
+                        block_start = line_block_metrics.start +
+                            line_block_metrics.size_above_baseline -
                             minimum_block_size_above_baseline
                     }
                     vertical_align::T::text_bottom => {
-                        block_start = line.bounds.start.b +
-                            line.inline_metrics.block_size_above_baseline +
+                        block_start = line_block_metrics.start +
+                            line_block_metrics.size_above_baseline +
                             minimum_depth_below_baseline -
                             fragment.border_box.size.block
                     }
                     vertical_align::T::top => {
-                        block_start = line.bounds.start.b
+                        block_start = line_block_metrics.start
                     }
                     vertical_align::T::bottom => {
-                        block_start = line.bounds.start.b + line.bounds.size.block -
+                        block_start = line_block_metrics.start + line_block_metrics.size -
                             fragment.border_box.size.block
                     }
                     vertical_align::T::LengthOrPercentage(LengthOrPercentage::Length(length)) => {
@@ -1261,13 +1283,18 @@ impl InlineFlow {
     }
 
     pub fn baseline_offset_of_last_line(&self) -> Option<Au> {
-        // Find the last line that doesn't consist entirely of hypothetical boxes.
+        self.last_line_containing_real_fragments().map(|line| {
+            line.bounds.start.b + line.bounds.size.block - line.inline_metrics.depth_below_baseline
+        })
+    }
+
+    // Returns the last line that doesn't consist entirely of hypothetical boxes.
+    fn last_line_containing_real_fragments(&self) -> Option<&Line> {
         for line in self.lines.iter().rev() {
             if (line.range.begin().get()..line.range.end().get()).any(|index| {
                 !self.fragments.fragments[index as usize].is_hypothetical()
             }) {
-                return Some(line.bounds.start.b + line.bounds.size.block -
-                            line.inline_metrics.depth_below_baseline)
+                return Some(line)
             }
         }
         None
@@ -1496,8 +1523,8 @@ impl Flow for InlineFlow {
                 &mut AbsoluteAssignBSizesTraversal(layout_context.shared_context()));
         }
 
-        self.base.position.size.block = match self.lines.last() {
-            Some(ref last_line) => last_line.bounds.start.b + last_line.bounds.size.block,
+        self.base.position.size.block = match self.last_line_containing_real_fragments() {
+            Some(last_line) => last_line.bounds.start.b + last_line.bounds.size.block,
             None => Au(0),
         };
 
@@ -1877,3 +1904,32 @@ enum LineFlushMode {
     No,
     Flush,
 }
+
+struct LineBlockMetrics {
+    start: Au,
+    size: Au,
+    size_above_baseline: Au,
+}
+
+impl LineBlockMetrics {
+    fn new(line: &Line, fragment: &Fragment, layout_context: &LayoutContext) -> LineBlockMetrics {
+        if !fragment.is_hypothetical() {
+            return LineBlockMetrics {
+                start: line.bounds.start.b,
+                size: line.bounds.size.block,
+                size_above_baseline: line.inline_metrics.block_size_above_baseline,
+            }
+        }
+
+        let hypothetical_inline_metrics = line.new_inline_metrics(fragment, layout_context);
+        let hypothetical_block_size = line.new_block_size(fragment,
+                                                          &hypothetical_inline_metrics,
+                                                          layout_context);
+        LineBlockMetrics {
+            start: line.bounds.start.b,
+            size: hypothetical_block_size,
+            size_above_baseline: hypothetical_inline_metrics.block_size_above_baseline,
+        }
+    }
+}
+
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-center.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-center.htm.ini
deleted file mode 100644
index e1ec6cbda45..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-center.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_justifycontent-center.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-flex-end.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-flex-end.htm.ini
deleted file mode 100644
index 85421666e65..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-flex-end.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_justifycontent-flex-end.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-negative.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-negative.htm.ini
deleted file mode 100644
index d277c8b9105..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound-negative.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_justifycontent-spacearound-negative.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound.htm.ini
deleted file mode 100644
index 04d097f1c5b..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacearound.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_justifycontent-spacearound.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacebetween-negative.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacebetween-negative.htm.ini
deleted file mode 100644
index 5b29a00bfa0..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacebetween-negative.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_justifycontent-spacebetween-negative.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacebetween-only.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacebetween-only.htm.ini
deleted file mode 100644
index 7b5e3e3b52e..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacebetween-only.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_justifycontent-spacebetween-only.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacebetween.htm.ini b/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacebetween.htm.ini
deleted file mode 100644
index d85a67ec609..00000000000
--- a/tests/wpt/metadata-css/css-flexbox-1_dev/html/flexbox_justifycontent-spacebetween.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox_justifycontent-spacebetween.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-005.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-005.htm.ini
deleted file mode 100644
index 8d9ec4a9883..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-005.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-005.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-017.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-017.htm.ini
deleted file mode 100644
index 8fdf242e02f..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-017.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-017.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-029.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-029.htm.ini
deleted file mode 100644
index 7f3071da31e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-029.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-029.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-041.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-041.htm.ini
deleted file mode 100644
index fafab03854e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-041.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-041.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-053.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-053.htm.ini
deleted file mode 100644
index fc834e76c8b..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-053.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-053.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-065.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-065.htm.ini
deleted file mode 100644
index 7397e7aa982..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-065.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-065.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-077.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-077.htm.ini
deleted file mode 100644
index a758faeff02..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-077.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-077.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-089.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-089.htm.ini
deleted file mode 100644
index 163a7d2bfe6..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-089.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-089.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-105.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-105.htm.ini
deleted file mode 100644
index c9d94fa9e70..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-105.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-105.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-137.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-137.htm.ini
deleted file mode 100644
index db3318ac0ce..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-137.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-137.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-143.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-143.htm.ini
deleted file mode 100644
index a8bd7fa5695..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-143.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-143.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-145.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-145.htm.ini
deleted file mode 100644
index 8f785011fd5..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-145.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-145.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-149.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-149.htm.ini
deleted file mode 100644
index ee59a9e1588..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vlr-149.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vlr-149.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-004.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-004.htm.ini
deleted file mode 100644
index 7e598eff6ed..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-004.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-004.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-016.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-016.htm.ini
deleted file mode 100644
index 2935de2a41d..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-016.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-016.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-028.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-028.htm.ini
deleted file mode 100644
index 90dcea824f4..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-028.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-028.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-040.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-040.htm.ini
deleted file mode 100644
index 674ec6b44bd..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-040.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-040.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-052.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-052.htm.ini
deleted file mode 100644
index a92085b1e68..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-052.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-052.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-064.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-064.htm.ini
deleted file mode 100644
index 7d8da42083e..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-064.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-064.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-076.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-076.htm.ini
deleted file mode 100644
index 9705255b63a..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-076.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-076.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-088.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-088.htm.ini
deleted file mode 100644
index 9d74b003070..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-088.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-088.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-104.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-104.htm.ini
deleted file mode 100644
index fbbc9484ede..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-104.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-104.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-136.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-136.htm.ini
deleted file mode 100644
index 88a6bee00f1..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-136.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-136.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-144.htm.ini b/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-144.htm.ini
deleted file mode 100644
index 1ac73959d45..00000000000
--- a/tests/wpt/metadata-css/css21_dev/html4/abs-pos-non-replaced-vrl-144.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[abs-pos-non-replaced-vrl-144.htm]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index c6a8ecb43e8..613cad0de9c 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -2420,6 +2420,30 @@
             "url": "/_mozilla/css/inline_absolute_hypothetical_clip_a.html"
           }
         ],
+        "css/inline_absolute_hypothetical_line_metrics_a.html": [
+          {
+            "path": "css/inline_absolute_hypothetical_line_metrics_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_absolute_hypothetical_line_metrics_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_absolute_hypothetical_line_metrics_a.html"
+          }
+        ],
+        "css/inline_absolute_hypothetical_metrics_a.html": [
+          {
+            "path": "css/inline_absolute_hypothetical_metrics_a.html",
+            "references": [
+              [
+                "/_mozilla/css/inline_absolute_hypothetical_metrics_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/inline_absolute_hypothetical_metrics_a.html"
+          }
+        ],
         "css/inline_absolute_out_of_flow_a.html": [
           {
             "path": "css/inline_absolute_out_of_flow_a.html",
@@ -16142,6 +16166,30 @@
           "url": "/_mozilla/css/inline_absolute_hypothetical_clip_a.html"
         }
       ],
+      "css/inline_absolute_hypothetical_line_metrics_a.html": [
+        {
+          "path": "css/inline_absolute_hypothetical_line_metrics_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_absolute_hypothetical_line_metrics_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_absolute_hypothetical_line_metrics_a.html"
+        }
+      ],
+      "css/inline_absolute_hypothetical_metrics_a.html": [
+        {
+          "path": "css/inline_absolute_hypothetical_metrics_a.html",
+          "references": [
+            [
+              "/_mozilla/css/inline_absolute_hypothetical_metrics_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/inline_absolute_hypothetical_metrics_a.html"
+        }
+      ],
       "css/inline_absolute_out_of_flow_a.html": [
         {
           "path": "css/inline_absolute_out_of_flow_a.html",
diff --git a/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_line_metrics_a.html b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_line_metrics_a.html
new file mode 100644
index 00000000000..0618934ce55
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_line_metrics_a.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="match" href="inline_absolute_hypothetical_line_metrics_ref.html">
+<style>
+body {
+    margin: 0;
+    padding: 0;
+}
+</style>
+<img width=25 height=25 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWP4z8DwHwAFAAH/q842iQAAAABJRU5ErkJggg=="><!--
+--><img style="position: absolute" width=100 height=100 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgYPj/HwADAgH/xCAAOgAAAABJRU5ErkJggg=="><!--
+--><img style="position: absolute" width=50 height=50 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgaGD4DwAChAGA2FJdiQAAAABJRU5ErkJggg==">
diff --git a/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_line_metrics_ref.html b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_line_metrics_ref.html
new file mode 100644
index 00000000000..dd8a0b04676
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_line_metrics_ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+body {
+    margin: 0;
+    padding: 0;
+}
+img {
+    display: block;
+    position: absolute;
+    top: 0;
+}
+</style>
+<img style="left: 0" width=25 height=25 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWP4z8DwHwAFAAH/q842iQAAAABJRU5ErkJggg=="><!--
+--><img style="left: 25px" width=100 height=100 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgYPj/HwADAgH/xCAAOgAAAABJRU5ErkJggg=="><!--
+--><img style="left: 25px" width=50 height=50 src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQImWNgaGD4DwAChAGA2FJdiQAAAABJRU5ErkJggg==">
+
diff --git a/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_metrics_a.html b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_metrics_a.html
new file mode 100644
index 00000000000..b1cb792ce95
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_metrics_a.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="match" href="inline_absolute_hypothetical_metrics_ref.html">
+<style>
+body, html {
+    margin: 0;
+    font-size: 36px;
+}
+span {
+    position: absolute;
+    right: 0;
+}
+</style>
+A<span>B
+
diff --git a/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_metrics_ref.html b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_metrics_ref.html
new file mode 100644
index 00000000000..35c21d7bea0
--- /dev/null
+++ b/tests/wpt/mozilla/tests/css/inline_absolute_hypothetical_metrics_ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<style>
+body, html {
+    margin: 0;
+    font-size: 36px;
+}
+div {
+    position: absolute;
+}
+#a {
+    left: 0;
+}
+#b {
+    right: 0;
+}
+</style>
+<div id=a>A</div><div id=b>B</div>
+