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.

Sign up for GitHub

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

Jump to bottom

layout: Fix a couple of issues relating to intrinsic widths of inline blocks. #5919

Merged
merged 1 commit into from
May 4, 2015
Merged

layout: Fix a couple of issues relating to intrinsic widths of inline blocks. #5919

merged 1 commit into from
May 4, 2015

Conversation

pcwalton
Copy link
Contributor

@pcwalton pcwalton commented May 2, 2015

  • Stop double-counting border and padding for inline-block fragments.
    (Test case: inline_block_border_intrinsic_size_a.html.)
  • Take clearance into account when determining intrinsic widths of
    blocks containing floats.

Improves the Amazon headers.

r? @mbrubeck

Review on Reviewable

@pcwalton
layout: Fix a couple of issues relating to intrinsic widths of inline
3308749 
blocks.

* Stop double-counting border and padding for inline-block fragments.
  (Test case: `inline_block_border_intrinsic_size_a.html`.)

* Take clearance into account when determining intrinsic widths of
  blocks containing floats.

Improves the Amazon headers.
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label May 2, 2015
@hoppipolla-critic-bot
Copy link

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

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.

@mbrubeck
Copy link
Contributor

mbrubeck commented May 4, 2015

Reviewed files:

  • components/layout/block.rs @ r1
  • components/layout/construct.rs @ r1
  • components/layout/fragment.rs @ r1
  • tests/ref/basic.list @ r1
  • tests/ref/float_clearance_intrinsic_width_a.html @ r1
  • tests/ref/float_clearance_intrinsic_width_ref.html @ r1
  • tests/ref/inline_block_border_intrinsic_size_a.html @ r1
  • tests/ref/inline_block_border_intrinsic_size_ref.html @ r1

Comments from the review on Reviewable.io

@mbrubeck mbrubeck added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels May 4, 2015
@mbrubeck
Copy link
Contributor

mbrubeck commented May 4, 2015

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 3308749 has been approved by mbrubeck

@bors-servo
Copy link
Contributor

⌛ Testing commit 3308749 with merge 7b87085...

bors-servo pushed a commit that referenced this pull request May 4, 2015
Auto merge of #5919 - pcwalton:inline-block-intrinsic-widths, r=mbrubeck
7b87085 
* Stop double-counting border and padding for inline-block fragments.
  (Test case: `inline_block_border_intrinsic_size_a.html`.)

* Take clearance into account when determining intrinsic widths of
  blocks containing floats.

Improves the Amazon headers.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5919)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2

@bors-servo bors-servo merged commit 3308749 into servo:master May 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@pcwalton @hoppipolla-critic-bot @mbrubeck @bors-servo @highfive