Skip to content
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: Implement `border-spacing` per CSS 2.1 § 17.6.1 and the legacy `cellspacing` attribute per HTML5 § 14.3.9. #4417

Merged
merged 1 commit into from Mar 12, 2015

Conversation

@pcwalton
Copy link
Contributor

pcwalton commented Dec 18, 2014

Table layout code has been refactored to push the spacing down to
rowgroups and rows; this will aid the implementation of
border-collapse as well.

r? @SimonSapin

@SimonSapin
Copy link
Member

SimonSapin commented Dec 18, 2014

Looks like this conflicts with master already. Please rebase before Critic picks it up.

@jdm jdm added the S-needs-rebase label Dec 18, 2014
@pcwalton pcwalton force-pushed the pcwalton:border-spacing branch from f41aeb0 to c160b0c Dec 18, 2014
@pcwalton
Copy link
Contributor Author

pcwalton commented Dec 18, 2014

Rebased.

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Dec 18, 2014

Critic review: https://critic.hoppipolla.co.uk/r/3542

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

@jdm jdm added the S-needs-rebase label Dec 18, 2014
@pcwalton pcwalton force-pushed the pcwalton:border-spacing branch from c160b0c to 22c1a62 Jan 30, 2015
@pcwalton
Copy link
Contributor Author

pcwalton commented Jan 30, 2015

Rebased. r? @SimonSapin

@jdm jdm added the S-needs-rebase label Feb 19, 2015
@pcwalton pcwalton force-pushed the pcwalton:border-spacing branch 2 times, most recently from 5433b01 to 82944bc Mar 2, 2015
@pcwalton pcwalton removed the S-needs-rebase label Mar 2, 2015
@pcwalton
Copy link
Contributor Author

pcwalton commented Mar 2, 2015

Rebased. r? @SimonSapin

@SimonSapin
Copy link
Member

SimonSapin commented Mar 3, 2015

Critic has 14 open issues on this PR, it looks like they haven’t been addressed. Rebasing in the middle of a review makes the rest of the review harder :(

@pcwalton pcwalton force-pushed the pcwalton:border-spacing branch from 37593d3 to a9ef030 Mar 4, 2015
@pcwalton
Copy link
Contributor Author

pcwalton commented Mar 4, 2015

Addressed issues. The tests you asked me to add actually exposed some bugs in automatic and fixed table layout independent of spacing, so I fixed those too.

r? @SimonSapin

@jdm jdm added the S-needs-rebase label Mar 5, 2015
@larsbergstrom
Copy link
Contributor

larsbergstrom commented Mar 12, 2015

The issues appear to have been addressed and the additional nasty issue fixes appear correct, to my understanding of the table layout code. Please squash and r+!

`cellspacing` attribute per HTML5 § 14.3.9.

Table layout code has been refactored to push the spacing down to
rowgroups and rows; this will aid the implementation of
`border-collapse` as well.

This commit also fixes two nasty issues in table layout:

* In fixed layout, extra space would not be divided among columns that
  had auto width but had nonzero minimum width.

* In automatic layout, extra space would be distributed to constrained
  columns as well even if unconstrained columns with percentage equal to
  zero were present.
@pcwalton pcwalton force-pushed the pcwalton:border-spacing branch from a9ef030 to 586c12c Mar 12, 2015
@pcwalton

This comment has been minimized.

Copy link
Owner Author

pcwalton commented on 586c12c Mar 12, 2015

r=larsbergstrom

@bors-servo

This comment has been minimized.

Copy link
Contributor

bors-servo commented on 586c12c Mar 12, 2015

saw approval from larsbergstrom
at pcwalton@586c12c

This comment has been minimized.

Copy link
Contributor

bors-servo replied Mar 12, 2015

merging pcwalton/servo/border-spacing = 586c12c into auto

This comment has been minimized.

Copy link
Contributor

bors-servo replied Mar 12, 2015

pcwalton/servo/border-spacing = 586c12c merged ok, testing candidate = 8e81122

This comment has been minimized.

Copy link
Contributor

bors-servo replied Mar 12, 2015

fast-forwarding master to auto = 8e81122

bors-servo pushed a commit that referenced this pull request Mar 12, 2015
Table layout code has been refactored to push the spacing down to
rowgroups and rows; this will aid the implementation of
`border-collapse` as well.

r? @SimonSapin
@bors-servo bors-servo closed this Mar 12, 2015
@bors-servo bors-servo merged commit 586c12c into servo:master Mar 12, 2015
1 check passed
1 check passed
default all tests passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.