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

Fix img with display: block. Fixes text/image overflow on wikipedia. #3419

Merged
merged 1 commit into from Sep 19, 2014

Conversation

@glennw
Copy link
Member

glennw commented Sep 19, 2014

Ref: #2554

@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Sep 19, 2014

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

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 19, 2014

@pcwalton
Copy link
Contributor

pcwalton commented Sep 19, 2014

r+, nice improvement!

@glennw glennw force-pushed the glennw:img-block branch from fe7d833 to 818f70e Sep 19, 2014
@glennw
Copy link
Member Author

glennw commented Sep 19, 2014

Rebased - will merge when green.

glennw added a commit that referenced this pull request Sep 19, 2014
Fix img with display: block. Fixes text/image overflow on wikipedia.
@glennw glennw merged commit 2652d22 into servo:master Sep 19, 2014
1 check passed
1 check passed
continuous-integration/travis-ci The Travis CI build passed
Details
@glennw glennw deleted the glennw:img-block branch Sep 19, 2014
@@ -1646,8 +1646,12 @@ impl Flow for BlockFlow {

fn assign_block_size<'a>(&mut self, ctx: &'a LayoutContext<'a>) {
if self.is_replaced_content() {
let _scope = layout_debug_scope!("assign_replaced_block_size_if_necessary {:s}",

This comment has been minimized.

Copy link
@jdm

jdm Sep 19, 2014

Member

Wrong scope name?

This comment has been minimized.

Copy link
@glennw

glennw Sep 19, 2014

Author Member

Ooops, you're right - will fix.

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

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