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: Take margins in the inline direction into account when guessing the inline-size of block formatting contexts. #11125

Merged
merged 1 commit into from May 11, 2016
Merged

layout: Take margins in the inline direction into account when guessing the inline-size of block formatting contexts. #11125

merged 1 commit into from May 11, 2016

Conversation

@pcwalton
Copy link
Contributor

pcwalton commented May 11, 2016 •
edited by larsbergstrom

Fixes the layout on reddit.com.

Partially addresses #10571.

r? @mbrubeck

This change is Reviewable
@pcwalton
layout: Take margins in the inline direction into account when
Loading status checks…
b6bed34 
guessing the inline-size of block formatting contexts.

Fixes the layout on reddit.com.

Partially addresses #10571.
@pcwalton
Copy link
Contributor Author

pcwalton commented May 11, 2016

@bors-servo: try
bors-servo added a commit that referenced this pull request May 11, 2016
@bors-servo
Auto merge of #11125 - pcwalton:reddit-block-formatting-context-fix, …
105912b 
…r=<try>

layout: Take margins in the inline direction into account when guessing the inline-size of block formatting contexts.

Fixes the layout on reddit.com.

Partially addresses #10571.

r? @mbrubeck

<!-- 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/11125)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 11, 2016

⌛ Trying commit b6bed34 with merge 105912b...
@mbrubeck
Copy link
Contributor

mbrubeck commented May 11, 2016

r=mbrubeck (waiting for try)

Previously, bors-servo wrote…

⌛ Trying commit b6bed34 with merge 105912b...

Reviewed 5 of 5 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.

Comments from Reviewable
@mbrubeck
Copy link
Contributor

mbrubeck commented May 11, 2016

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

bors-servo commented May 11, 2016

📌 Commit b6bed34 has been approved by mbrubeck
@bors-servo
Copy link
Contributor

bors-servo commented May 11, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows
@bors-servo
Copy link
Contributor

bors-servo commented May 11, 2016

⌛ Testing commit b6bed34 with merge 00ad22c...
bors-servo added a commit that referenced this pull request May 11, 2016
@bors-servo
Auto merge of #11125 - pcwalton:reddit-block-formatting-context-fix, …
00ad22c 
…r=mbrubeck

layout: Take margins in the inline direction into account when guessing the inline-size of block formatting contexts.

Fixes the layout on reddit.com.

Partially addresses #10571.

r? @mbrubeck

<!-- 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/11125)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 11, 2016

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

highfive commented May 11, 2016 

  ▶ TIMEOUT [expected OK] /html/dom/reflection-embedded.html
  │ 
  │ thread &#39;http_loader for http://web-platform.test:8000/html/dom/test-valueOf&#39; panicked at &#39;could not initialize thread_rng: Too many open files (os error 24)&#39;, /Users/servo/buildbot/slave/mac-rel-wpt/build/.cargo/registry/src/github.com-88ac128001ac3a9a/rand-0.3.14/src/lib.rs:873
  │ stack backtrace:
  │ thread &#39;http_loader for http://web-platform.test:8000/html/dom/test-valueOf&#39; panicked at &#39;could not initialize thread_rng: Too many open files (os error 24)&#39;, /Users/servo/buildbot/slave/mac-rel-wpt/build/.cargo/registry/src/github.com-88ac128001ac3a9a/rand-0.3.14/src/lib.rs:873
  │    1:        0x106a2a348 - std::sys::backtrace::tracing::imp::write::h9fb600083204ae7f
  │    2:        0x106a30765 - std::panicking::default_hook::_$u7b$$u7b$closure$u7d$$u7d$::hca543c34f11229ac
  │    3:        0x106a3037e - std::panicking::default_hook::hc2c969e7453d080c
  │    4:        0x1061d81d2 - util::panicking::initiate_panic_hook::_$u7b$$u7b$closure$u7d$$u7d$::_$u7b$$u7b$closure$u7d$$u7d$::h0bad41b0b38a855d
  │    5:        0x106a17a18 - std::sys_common::unwind::begin_unwind_inner::h30e12d15ce2b2e25
  │    6:        0x106a1934e - std::sys_common::unwind::begin_unwind_fmt::hb2de8a9968d38523
  │    7:        0x106830c3f - rand::thread_rng::THREAD_RNG_KEY::__init::h95086aa3feb19f11
  │    8:        0x106830a7c - rand::thread_rng::h685796b33c6d5157
  │    9:        0x106211182 - uuid::Uuid::new_v4::hf5742953332a48bd
  │   10:        0x1054cfad9 - net::http_loader::load::h68b5ac4fbf09d0a1
  │   11:        0x1054cc6bd - std::sys_common::unwind::try::try_fn::haa463cfb1553106f
  │   12:        0x106a295ab - __rust_try
  │   13:        0x106a29533 - std::sys_common::unwind::inner_try::h47a4d9cd4a369dcd
  │   14:        0x1054cd79d - _&lt;F as std..boxed..FnBox&lt;A&gt;&gt;::call_box::hcf395b9e94fe155c
  │   15:        0x106a2f7e8 - std::sys::thread::Thread::new::thread_start::h6f266e069bf4ec2b
  │   16:     0x7fff8c3c2059 - _pthread_body
  │   17:     0x7fff8c3c1fd6 - _pthread_start
  │ stack backtrace:
  │    1:        0x106a2a348 - std::sys::backtrace::tracing::imp::write::h9fb600083204ae7f
  │    2:        0x106a30765 - std::panicking::default_hook::_$u7b$$u7b$closure$u7d$$u7d$::hca543c34f11229ac
  │    3:        0x106a3037e - std::panicking::default_hook::hc2c969e7453d080c
  │    4:        0x1061d81d2 - util::panicking::initiate_panic_hook::_$u7b$$u7b$closure$u7d$$u7d$::_$u7b$$u7b$closure$u7d$$u7d$::h0bad41b0b38a855d
  │    5:        0x106a17a18 - std::sys_common::unwind::begin_unwind_inner::h30e12d15ce2b2e25
  │    6:        0x106a1934e - std::sys_common::unwind::begin_unwind_fmt::hb2de8a9968d38523
  │    7:        0x106830c3f - rand::thread_rng::THREAD_RNG_KEY::__init::h95086aa3feb19f11
  │    8:        0x106830a7c - rand::thread_rng::h685796b33c6d5157
  │    9:        0x106211182 - uuid::Uuid::new_v4::hf5742953332a48bd
  │   10:        0x1054cfad9 - net::http_loader::load::h68b5ac4fbf09d0a1
  │   11:        0x1054cc6bd - std::sys_common::unwind::try::try_fn::haa463cfb1553106f
  │   12:        0x106a295ab - __rust_try
  │   13:        0x106a29533 - std::sys_common::unwind::inner_try::h47a4d9cd4a369dcd
  │   14:        0x1054cd79d - _&lt;F as std..boxed..FnBox&lt;A&gt;&gt;::call_box::hcf395b9e94fe155c
  │   15:        0x106a2f7e8 - std::sys::thread::Thread::new::thread_start::h6f266e069bf4ec2b
  │   16:     0x7fff8c3c2059 - _pthread_body
  └   17:     0x7fff8c3c1fd6 - _pthread_start
@emilio
Copy link
Member

emilio commented May 11, 2016

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

bors-servo commented May 11, 2016

⌛ Testing commit b6bed34 with merge 9886374...
bors-servo added a commit that referenced this pull request May 11, 2016
@bors-servo
Auto merge of #11125 - pcwalton:reddit-block-formatting-context-fix, …
Loading status checks…
9886374 
…r=mbrubeck

layout: Take margins in the inline direction into account when guessing the inline-size of block formatting contexts.

Fixes the layout on reddit.com.

Partially addresses #10571.

r? @mbrubeck

<!-- 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/11125)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 11, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows
@bors-servo bors-servo merged commit b6bed34 into servo:master May 11, 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
@pcwalton pcwalton mentioned this pull request May 11, 2016
Closed
@pcwalton pcwalton deleted the pcwalton:reddit-block-formatting-context-fix branch May 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mbrubeck mbrubeck

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@pcwalton @bors-servo @mbrubeck @highfive @emilio
You can’t perform that action at this time.