Auto merge of #13470 - pcwalton:inline-absolute-hypothetical-baseline, r=notriddle

layout: Improve the interaction between baseline-offset-of-last-line-in-flow logic and inline absolute hypothetical boxes.

See commits for details. These changes place the heart icon on Twitter in the right place.

r? @notriddle

<!-- 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/13470)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-29 00:11:33 -05:00 committed by GitHub
commit ccfc60161b
5 changed files with 49 additions and 7 deletions

View file

@ -2372,6 +2372,18 @@
"url": "/_mozilla/css/incremental_visibility_a.html"
}
],
"css/inline_absolute_hypothetical_baseline_a.html": [
{
"path": "css/inline_absolute_hypothetical_baseline_a.html",
"references": [
[
"/_mozilla/css/inline_absolute_hypothetical_baseline_ref.html",
"=="
]
],
"url": "/_mozilla/css/inline_absolute_hypothetical_baseline_a.html"
}
],
"css/inline_absolute_hypothetical_clip_a.html": [
{
"path": "css/inline_absolute_hypothetical_clip_a.html",
@ -16010,6 +16022,18 @@
"url": "/_mozilla/css/incremental_visibility_a.html"
}
],
"css/inline_absolute_hypothetical_baseline_a.html": [
{
"path": "css/inline_absolute_hypothetical_baseline_a.html",
"references": [
[
"/_mozilla/css/inline_absolute_hypothetical_baseline_ref.html",
"=="
]
],
"url": "/_mozilla/css/inline_absolute_hypothetical_baseline_a.html"
}
],
"css/inline_absolute_hypothetical_clip_a.html": [
{
"path": "css/inline_absolute_hypothetical_clip_a.html",

View file

@ -0,0 +1,10 @@
<!doctype html>
<meta charset="utf-8">
<title></title>
<link rel="match" href="inline_absolute_hypothetical_baseline_ref.html">
<div style="display: inline-block">
<div>A</div>
<span style="position: absolute;">B</span>
</div>
C
D

View file

@ -0,0 +1,4 @@
<!DOCTYPE html>
<meta charset="utf-8">
<div>A C D</div>
<div>B</div>