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

Implement basic support for display: inline-block. #3286

Merged
merged 1 commit into from Sep 13, 2014

Conversation

@glennw
Copy link
Member

glennw commented Sep 11, 2014

This still needs a lot of work, but it covers the basic
cases and improves wikipedia while passing all existing tests.

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Sep 11, 2014

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

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.

@glennw
Copy link
Member Author

glennw commented Sep 11, 2014

@pcwalton - this is very much a prototype - would be good to know if I'm on the right track with how you were thinking of structuring it though.

@@ -838,6 +879,12 @@ impl<'a, 'b> PostorderNodeMutTraversal for FlowConstructor<'a, 'b> {
node.set_flow_construction_result(construction_result)
}

// Inline items contribute inline fragment construction results.

This comment has been minimized.

Copy link
@pcwalton

pcwalton Sep 11, 2014

Contributor

nit: comment should say "inline-block items"

@pcwalton
Copy link
Contributor

pcwalton commented Sep 11, 2014

Looks straightforward. r=me with comment fixed.

@jdm
Copy link
Member

jdm commented Sep 11, 2014

failures:
---- append_style_a.html == append_style_b.html stdout ----
task 'append_style_a.html == append_style_b.html' failed at 'rendering difference: /tmp/servo-reftest-000037-diff.png', tests/reftest.rs:275

---- inline_block_img_a.html == inline_block_img_ref.html stdout ----
task 'inline_block_img_a.html == inline_block_img_ref.html' failed at 'rendering difference: /tmp/servo-reftest-000097-diff.png', tests/reftest.rs:275
@glennw glennw force-pushed the glennw:inline_block branch 2 times, most recently from 7772fd1 to 03f9306 Sep 12, 2014
@mbrubeck
Copy link
Contributor

mbrubeck commented Sep 12, 2014

cc #225

@glennw glennw force-pushed the glennw:inline_block branch from 03f9306 to 87228d4 Sep 12, 2014
@glennw
Copy link
Member Author

glennw commented Sep 12, 2014

Rebased (again!)

This still needs a lot of work, but it covers the basic
cases and improves wikipedia while passing all existing tests.

Tweak reftest to deal with linux/travis black background.
@glennw glennw force-pushed the glennw:inline_block branch from 87228d4 to 98624c9 Sep 12, 2014
@pcwalton
Copy link
Contributor

pcwalton commented Sep 13, 2014

Travis seems to be acting funny so I'll merge this and take responsibility for backing out if it breaks stuff.

pcwalton added a commit that referenced this pull request Sep 13, 2014
Implement basic support for display: inline-block.
@pcwalton pcwalton merged commit b64f27b into servo:master Sep 13, 2014
1 check was pending
1 check was pending
continuous-integration/travis-ci The Travis CI build is in progress
Details
@glennw glennw deleted the glennw:inline_block branch Sep 15, 2014
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.