Auto merge of #16337 - stshine:inline-block-intrinsic, r=notriddle

layout: Fix intrinsic inline size calculating of inline blocks

When calculating intrinsic inline sizes of an inline block, take its
nested inline parents into account.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #7636 (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/16337)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-21 22:43:06 -05:00 committed by GitHub
commit bbf292b120
4 changed files with 74 additions and 24 deletions

View file

@ -2699,6 +2699,18 @@
{}
]
],
"css/inline_block_nested_margin.html": [
[
"/_mozilla/css/inline_block_nested_margin.html",
[
[
"/_mozilla/css/inline_block_nested_margin_ref.html",
"=="
]
],
{}
]
],
"css/inline_block_opacity_change.html": [
[
"/_mozilla/css/inline_block_opacity_change.html",
@ -7939,6 +7951,11 @@
{}
]
],
"css/inline_block_nested_margin_ref.html": [
[
{}
]
],
"css/inline_block_opacity_change_ref.html": [
[
{}
@ -21886,6 +21903,14 @@
"ed6e0f503cb26c1091270ed0992a0a41553846d9",
"support"
],
"css/inline_block_nested_margin.html": [
"b4114aa6421b4c9117e60e66ccc09868e05f3239",
"reftest"
],
"css/inline_block_nested_margin_ref.html": [
"5e00c77f55a3d12e841e9c99395f4d3783664fd8",
"support"
],
"css/inline_block_opacity_change.html": [
"df6b37b744fdf79da9d33c54b8ce77abd462c53b",
"reftest"