Skip to content

/ servo

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

layout: Add support for vertical alignment within table cells. #10722

Merged
merged 1 commit into from Apr 26, 2016
Merged

layout: Add support for vertical alignment within table cells. #10722

merged 1 commit into from Apr 26, 2016

Conversation

@notriddle
Copy link
Contributor

notriddle commented Apr 19, 2016

Fixes #10621

This change is Reviewable
@notriddle notriddle changed the title Add support for vertical alignment within table cells. layout: Add support for vertical alignment within table cells. Apr 19, 2016
@SimonSapin
Copy link
Member

SimonSapin commented Apr 20, 2016

Thanks!

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Apr 20, 2016

📌 Commit 6974652 has been approved by SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Apr 20, 2016

⌛ Testing commit 6974652 with merge c1ead34...
bors-servo added a commit that referenced this pull request Apr 20, 2016
@bors-servo
Auto merge of #10722 - notriddle:table_cell_valign, r=SimonSapin
Loading status checks…
c1ead34 
layout: Add support for vertical alignment within table cells.

Fixes #10621

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10722)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 20, 2016

💔 Test failed - linux-rel
@jdm
Copy link
Member

jdm commented Apr 20, 2016 

  ▶ FAIL [expected PASS] /css21_dev/html4/floats-wrap-bfc-001-left-overflow.htm
  └   → /css21_dev/html4/floats-wrap-bfc-001-left-overflow.htm 252edff283e8f3395a2b9bff9e1f4bb79bf9520e
/css21_dev/html4/reference/floats-wrap-bfc-001-left-overflow-ref.htm c3a278115ff68702eec6eef472830b73b56c5ca4
Testing 252edff283e8f3395a2b9bff9e1f4bb79bf9520e == c3a278115ff68702eec6eef472830b73b56c5ca4

  ▶ FAIL [expected PASS] /css21_dev/html4/floats-wrap-bfc-001-left-table.htm
  └   → /css21_dev/html4/floats-wrap-bfc-001-left-table.htm 51a04b5663a0742ae83e073b4d19493f3c99927c
/css21_dev/html4/reference/floats-wrap-bfc-001-left-table-ref.htm 65b9b28a992188577f0143f69f7174b310641097
Testing 51a04b5663a0742ae83e073b4d19493f3c99927c == 65b9b28a992188577f0143f69f7174b310641097

  ▶ FAIL [expected PASS] /css21_dev/html4/floats-wrap-bfc-001-right-overflow.htm
  └   → /css21_dev/html4/floats-wrap-bfc-001-right-overflow.htm 35281888b2103f38b8d20505fdff67a714ca88a7
/css21_dev/html4/reference/floats-wrap-bfc-001-right-overflow-ref.htm 5b2654c00c64deeb9d4f6b2deb586adbcad4dcea
Testing 35281888b2103f38b8d20505fdff67a714ca88a7 == 5b2654c00c64deeb9d4f6b2deb586adbcad4dcea

  ▶ FAIL [expected PASS] /css21_dev/html4/floats-wrap-bfc-001-right-table.htm
  └   → /css21_dev/html4/floats-wrap-bfc-001-right-table.htm 9228915f27c6f357cc01ec5b692350572be57c29
/css21_dev/html4/reference/floats-wrap-bfc-001-right-table-ref.htm cf0a391cb213d457bab21dd4f3ee81a0d7c7fb9b
Testing 9228915f27c6f357cc01ec5b692350572be57c29 == cf0a391cb213d457bab21dd4f3ee81a0d7c7fb9b

  ▶ FAIL [expected PASS] /css21_dev/html4/floats-wrap-bfc-003-left-overflow.htm
  └   → /css21_dev/html4/floats-wrap-bfc-003-left-overflow.htm e0813a345422e055b3bcdc40b76dd0a0f69a6d6a
/css21_dev/html4/reference/floats-wrap-bfc-003-left-overflow-ref.htm 43f657c70beb6673a6f90ff025c7f06c55e5e20a
Testing e0813a345422e055b3bcdc40b76dd0a0f69a6d6a == 43f657c70beb6673a6f90ff025c7f06c55e5e20a

  ▶ FAIL [expected PASS] /css21_dev/html4/floats-wrap-bfc-003-right-overflow.htm
  └   → /css21_dev/html4/floats-wrap-bfc-003-right-overflow.htm d79fd7822e2d250e729cf0d71938b150338eaa08
/css21_dev/html4/reference/floats-wrap-bfc-003-right-overflow-ref.htm bcbd5aa6f218c40b4ca5d75a1c2d57e9134b3a48
Testing d79fd7822e2d250e729cf0d71938b150338eaa08 == bcbd5aa6f218c40b4ca5d75a1c2d57e9134b3a48

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-106.htm
  └   → /css21_dev/html4/margin-collapse-106.htm 95da76c6a92213707f31b4449a6efabcbbd97956
/css21_dev/html4/reference/margin-collapse-106-ref.htm 0573ebbb908815f7f8e760f58a56c4b9c6ad34d5
Testing 95da76c6a92213707f31b4449a6efabcbbd97956 == 0573ebbb908815f7f8e760f58a56c4b9c6ad34d5

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-110.htm
  └   → /css21_dev/html4/margin-collapse-110.htm a7b51eeb4566bf73589e763da4e494742912413c
/css21_dev/html4/reference/margin-collapse-110-ref.htm 2d82835c2ca6ad59272581ccd188e65f04495fb2
Testing a7b51eeb4566bf73589e763da4e494742912413c == 2d82835c2ca6ad59272581ccd188e65f04495fb2

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-112.htm
  └   → /css21_dev/html4/margin-collapse-112.htm 95da76c6a92213707f31b4449a6efabcbbd97956
/css21_dev/html4/reference/margin-collapse-106-ref.htm 0573ebbb908815f7f8e760f58a56c4b9c6ad34d5
Testing 95da76c6a92213707f31b4449a6efabcbbd97956 == 0573ebbb908815f7f8e760f58a56c4b9c6ad34d5

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-111.htm
  └   → /css21_dev/html4/margin-collapse-111.htm a7b51eeb4566bf73589e763da4e494742912413c
/css21_dev/html4/reference/margin-collapse-110-ref.htm 2d82835c2ca6ad59272581ccd188e65f04495fb2
Testing a7b51eeb4566bf73589e763da4e494742912413c == 2d82835c2ca6ad59272581ccd188e65f04495fb2

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-156.htm
  └   → /css21_dev/html4/margin-collapse-156.htm 2df71df2a230d95798c93ad1fff2d605cfe8e79f
/css21_dev/html4/reference/margin-collapse-156-ref.htm e86f3b4e92e45da8f7152256f4bf4b62bb8e2fbb
Testing 2df71df2a230d95798c93ad1fff2d605cfe8e79f == e86f3b4e92e45da8f7152256f4bf4b62bb8e2fbb

  ▶ PASS [expected FAIL] /css21_dev/html4/vertical-align-applies-to-007.htm

Well, there's a PASS with vertical-align in the name, so that's nice :)
@notriddle
Copy link
Contributor Author

notriddle commented Apr 20, 2016

@bors-servo try

The test failures were me assuming that the first child would define the upper bound (and the last child the lower bound). Silly me.
@bors-servo
Copy link
Contributor

bors-servo commented Apr 20, 2016

⌛ Trying commit e121a43 with merge bf9eb67...
bors-servo added a commit that referenced this pull request Apr 20, 2016
@bors-servo
Auto merge of #10722 - notriddle:table_cell_valign, r=<try>
Loading status checks…
bf9eb67 
layout: Add support for vertical alignment within table cells.

Fixes #10621

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10722)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 20, 2016

💔 Test failed - mac-rel-css
@bors-servo
Copy link
Contributor

bors-servo commented Apr 20, 2016

☔ The latest upstream changes (presumably #9942) made this pull request unmergeable. Please resolve the merge conflicts.
@notriddle
Copy link
Contributor Author

notriddle commented Apr 20, 2016

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented Apr 20, 2016

⌛ Trying commit 7ad41a6 with merge c176c47...
bors-servo added a commit that referenced this pull request Apr 20, 2016
@bors-servo
Auto merge of #10722 - notriddle:table_cell_valign, r=<try>
Loading status checks…
c176c47 
layout: Add support for vertical alignment within table cells.

Fixes #10621

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10722)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 20, 2016

💔 Test failed - linux-rel
@notriddle
Copy link
Contributor Author

notriddle commented Apr 20, 2016

I got it down to five, now.

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-111.htm
  └   → /css21_dev/html4/margin-collapse-111.htm a7b51eeb4566bf73589e763da4e494742912413c
/css21_dev/html4/reference/margin-collapse-110-ref.htm 2d82835c2ca6ad59272581ccd188e65f04495fb2
Testing a7b51eeb4566bf73589e763da4e494742912413c == 2d82835c2ca6ad59272581ccd188e65f04495fb2

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-112.htm
  └   → /css21_dev/html4/margin-collapse-112.htm 95da76c6a92213707f31b4449a6efabcbbd97956
/css21_dev/html4/reference/margin-collapse-106-ref.htm 0573ebbb908815f7f8e760f58a56c4b9c6ad34d5
Testing 95da76c6a92213707f31b4449a6efabcbbd97956 == 0573ebbb908815f7f8e760f58a56c4b9c6ad34d5

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-110.htm
  └   → /css21_dev/html4/margin-collapse-110.htm a7b51eeb4566bf73589e763da4e494742912413c
/css21_dev/html4/reference/margin-collapse-110-ref.htm 2d82835c2ca6ad59272581ccd188e65f04495fb2
Testing a7b51eeb4566bf73589e763da4e494742912413c == 2d82835c2ca6ad59272581ccd188e65f04495fb2

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-106.htm
  └   → /css21_dev/html4/margin-collapse-106.htm 95da76c6a92213707f31b4449a6efabcbbd97956
/css21_dev/html4/reference/margin-collapse-106-ref.htm 0573ebbb908815f7f8e760f58a56c4b9c6ad34d5
Testing 95da76c6a92213707f31b4449a6efabcbbd97956 == 0573ebbb908815f7f8e760f58a56c4b9c6ad34d5

  ▶ FAIL [expected PASS] /css21_dev/html4/margin-collapse-156.htm
  └   → /css21_dev/html4/margin-collapse-156.htm 2df71df2a230d95798c93ad1fff2d605cfe8e79f
/css21_dev/html4/reference/margin-collapse-156-ref.htm e86f3b4e92e45da8f7152256f4bf4b62bb8e2fbb
Testing 2df71df2a230d95798c93ad1fff2d605cfe8e79f == e86f3b4e92e45da8f7152256f4bf4b62bb8e2fbb

  ▶ PASS [expected FAIL] /css21_dev/html4/vertical-align-applies-to-007.htm
@jdm
Copy link
Member

jdm commented Apr 20, 2016

That's #10753.
@notriddle
Copy link
Contributor Author

notriddle commented Apr 21, 2016

Cool, then I've fixed the bugs and it's ready for you to re-review.
@SimonSapin
Copy link
Member

SimonSapin commented Apr 26, 2016

@bors-servo r+

Reviewed 5 of 7 files at r1, 1 of 2 files at r3, 2 of 2 files at r4, 1 of 1 files at r5.
Review status: all files reviewed at latest revision, all discussions resolved, some commit checks failed.

Comments from Reviewable
@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2016

📌 Commit 8953207 has been approved by SimonSapin
@Ms2ger
Copy link
Contributor

Ms2ger commented Apr 26, 2016

@bors-servo p=0
@Ms2ger
Copy link
Contributor

Ms2ger commented Apr 26, 2016

@bors-servo r=SimonSapin
@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2016

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: #10767
@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2016

📌 Commit 8953207 has been approved by SimonSapin
@jdm
Copy link
Member

jdm commented Apr 26, 2016

@bors-servo: try- retry clean
@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2016

⌛ Testing commit 8953207 with merge c4de966...
bors-servo added a commit that referenced this pull request Apr 26, 2016
@bors-servo
Auto merge of #10722 - notriddle:table_cell_valign, r=SimonSapin
Loading status checks…
c4de966 
layout: Add support for vertical alignment within table cells.

Fixes #10621

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10722)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2016

💔 Test failed - mac-rel-wpt
@highfive
Copy link

highfive commented Apr 26, 2016 

  ▶ CRASH [expected OK] /html/dom/documents/dom-tree-accessors/document.getElementsByName/document.getElementsByName-same.html
@notriddle
Copy link
Contributor Author

notriddle commented Apr 26, 2016

@bors-servo retry

Check for intermittent, because this test contains no tables.
@SimonSapin SimonSapin mentioned this pull request Apr 26, 2016
Closed
@SimonSapin
Copy link
Member

SimonSapin commented Apr 26, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2016

⌛ Testing commit 8953207 with merge 31a4408...
bors-servo added a commit that referenced this pull request Apr 26, 2016
@bors-servo
Auto merge of #10722 - notriddle:table_cell_valign, r=SimonSapin
Loading status checks…
31a4408 
layout: Add support for vertical alignment within table cells.

Fixes #10621

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10722)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 26, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt
@bors-servo bors-servo merged commit 8953207 into servo:master Apr 26, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@notriddle notriddle deleted the notriddle:table_cell_valign branch Apr 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SimonSapin SimonSapin

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@notriddle @SimonSapin @bors-servo @jdm @Ms2ger @highfive
You can’t perform that action at this time.