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

stylo: Use correct counts when copying from image layers. #16956

Merged
merged 1 commit into from May 21, 2017
Merged

stylo: Use correct counts when copying from image layers. #16956

merged 1 commit into from May 21, 2017

Conversation

@mbrubeck
Copy link
Contributor

mbrubeck commented May 19, 2017 •
edited by larsbergstrom

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because they are code cleanup.

This change is Reviewable
@mbrubeck
Bug 1365370 - stylo: Use correct counts when copying from image layers.
Loading status checks…
a8b0a55
@highfive
Copy link

highfive commented May 19, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/gecko.mako.rs
  • @emilio: components/style/properties/gecko.mako.rs
@highfive
Copy link

highfive commented May 19, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@mbrubeck
Copy link
Contributor Author

mbrubeck commented May 19, 2017

@bors-servo r=Manishearth
@bors-servo
Copy link
Contributor

bors-servo commented May 19, 2017

📌 Commit a8b0a55 has been approved by Manishearth
@highfive highfive assigned Manishearth and unassigned KiChjang May 19, 2017
@Manishearth Manishearth changed the title Bug 1365370 - stylo: Use correct counts when copying from image layers. stylo: Use correct counts when copying from image layers. May 20, 2017
@bors-servo
Copy link
Contributor

bors-servo commented May 21, 2017

⌛ Testing commit a8b0a55 with merge aa17e2f...
bors-servo added a commit that referenced this pull request May 21, 2017
@bors-servo
Auto merge of #16956 - mbrubeck:cleanup, r=Manishearth
Loading status checks…
aa17e2f 
stylo: Use correct counts when copying from image layers.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they are code cleanup.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16956)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 21, 2017

💔 Test failed - linux-rel-wpt
@jdm
Copy link
Member

jdm commented May 21, 2017 

  ▶ CRASH [expected TIMEOUT] /webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-non-reserved-words.html
...
  │ already mutably borrowed (thread <unnamed>, at /home/servo/.cargo/registry/src/github.com-1ecc6299db9ec823/atomic_refcell-0.1.0/src/lib.rs:161)
  │ stack backtrace:
  │    0:     0x7fc8adcbb6fc - backtrace::backtrace::trace::haa53f4880ff627c6
  │    1:     0x7fc8adcbbbc2 - backtrace::capture::Backtrace::new::h5f3de869c0349b3d
  │    2:     0x7fc8accaa135 - servo::main::{{closure}}::hc2262116bcc3d90c
  │    3:     0x7fc8aed1a21a - std::panicking::rust_panic_with_hook
  │                         at /checkout/src/libstd/panicking.rs:550
  │    4:     0x7fc8aecec1ff - std::panicking::begin_panic::hdd5fad43da122cdb
  │    5:     0x7fc8aecec2a7 - atomic_refcell::AtomicBorrowRef::do_panic::h6b437ba5eb8d39f5
  │    6:     0x7fc8acdff7b9 - style::traversal::compute_style::h03fcf9b7213a9dfe
  │    7:     0x7fc8acda2082 - <layout::traversal::RecalcStyleAndConstructFlows<'a> as style::traversal::DomTraversal<E>>::process_preorder::hde4b30b1113bba35
  │    8:     0x7fc8acdfaba7 - style::parallel::traverse_nodes::h11e53070a5298392
  │    9:     0x7fc8acdfaf33 - style::parallel::traverse_nodes::h11e53070a5298392
  │   10:     0x7fc8acdfaf33 - style::parallel::traverse_nodes::h11e53070a5298392
  │   11:     0x7fc8acdfaf33 - style::parallel::traverse_nodes::h11e53070a5298392
  │   12:     0x7fc8acdce546 - std::panicking::try::do_call::hca25ec2db3aa6e09
  │   13:     0x7fc8aed2133a - panic_unwind::__rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:98
  │   14:     0x7fc8acd9cf5d - rayon_core::registry::in_worker::h783af26ead30bbe4
  │   15:     0x7fc8acdcd1f7 - std::panicking::try::do_call::h4719d8bee3aa929c
  │   16:     0x7fc8aed2133a - panic_unwind::__rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:98
  │   17:     0x7fc8ace295c1 - <rayon_core::job::StackJob<L, F, R> as rayon_core::job::Job>::execute::ha99aaad1ce000762
  │   18:     0x7fc8ae3b44e1 - rayon_core::registry::WorkerThread::wait_until::hb8bb0271392b3c70
  │   19:     0x7fc8ae3affc1 - std::sys_common::backtrace::__rust_begin_short_backtrace::hc42ae88fee5e8b73
  │   20:     0x7fc8ae3b076b - std::panicking::try::do_call::h0ae761b9e3a0cc1e
  │   21:     0x7fc8aed2133a - panic_unwind::__rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:98
  │   22:     0x7fc8ae3b10e7 - <F as alloc::boxed::FnBox<A>>::call_box::h91b4e629ac890bb2
  │   23:     0x7fc8aed18d95 - alloc::boxed::{{impl}}::call_once<(),()>
  │                         at /checkout/src/liballoc/boxed.rs:658
  │                          - std::sys_common::thread::start_thread
  │                         at /checkout/src/libstd/sys_common/thread.rs:21
  │                          - std::sys::imp::thread::{{impl}}::new::thread_start
  │                         at /checkout/src/libstd/sys/unix/thread.rs:84
  │   24:     0x7fc8aabbf183 - start_thread
  │   25:     0x7fc8aa6d6bec - clone
  │   26:                0x0 - <unknown>
  │ ERROR:servo: already mutably borrowed
  └ Pipeline failed in hard-fail mode.  Crashing!

  ▶ CRASH [expected OK] /webgl/conformance-1.0.3/conformance/ogles/GL/build/build_129_to_136.html
...
  │ already immutably borrowed (thread <unnamed>, at /home/servo/.cargo/registry/src/github.com-1ecc6299db9ec823/atomic_refcell-0.1.0/src/lib.rs:198)
  │ stack backtrace:
  │    0:     0x7f9cea2ae6fc - backtrace::backtrace::trace::haa53f4880ff627c6
  │    1:     0x7f9cea2aebc2 - backtrace::capture::Backtrace::new::h5f3de869c0349b3d
  │    2:     0x7f9ce929d135 - servo::main::{{closure}}::hc2262116bcc3d90c
  │    3:     0x7f9ceb30d21a - std::panicking::rust_panic_with_hook
  │                         at /checkout/src/libstd/panicking.rs:550
  │    4:     0x7f9ceb30d064 - std::panicking::begin_panic<collections::string::String>
  │                         at /checkout/src/libstd/panicking.rs:511
  │    5:     0x7f9ceb30cfe9 - std::panicking::begin_panic_fmt
  │                         at /checkout/src/libstd/panicking.rs:495
  │    6:     0x7f9ce9411e73 - <layout::construct::FlowConstructor<'a, ConcreteThreadSafeLayoutNode>>::set_flow_construction_result::h00a788d295a68c67
  │    7:     0x7f9ce93a8c8f - <layout::construct::FlowConstructor<'a, ConcreteThreadSafeLayoutNode> as layout::traversal::PostorderNodeMutTraversal<ConcreteThreadSafeLayoutNode>>::process::hd72a7e088fd5762d
  │    8:     0x7f9ce93effee - style::traversal::DomTraversal::handle_postorder_traversal::h1766ed300209a11b
  │    9:     0x7f9ce93c07b9 - std::panicking::try::do_call::h5e6c314a1363754a
  │   10:     0x7f9ceb31433a - panic_unwind::__rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:98
  │   11:     0x7f9ce94085ee - <rayon_core::job::HeapJob<BODY> as rayon_core::job::Job>::execute::h2ee82a74c957c342
  │   12:     0x7f9cea9a74e1 - rayon_core::registry::WorkerThread::wait_until::hb8bb0271392b3c70
  │   13:     0x7f9cea9a7fa5 - rayon_core::scope::Scope::steal_till_jobs_complete::h56924a9e9aac9810
  │   14:     0x7f9ce938ffda - rayon_core::registry::in_worker::h783af26ead30bbe4
  │   15:     0x7f9ce93c01f7 - std::panicking::try::do_call::h4719d8bee3aa929c
  │   16:     0x7f9ceb31433a - panic_unwind::__rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:98
  │   17:     0x7f9ce941c5c1 - <rayon_core::job::StackJob<L, F, R> as rayon_core::job::Job>::execute::ha99aaad1ce000762
  │   18:     0x7f9cea9a74e1 - rayon_core::registry::WorkerThread::wait_until::hb8bb0271392b3c70
  │   19:     0x7f9cea9a2fc1 - std::sys_common::backtrace::__rust_begin_short_backtrace::hc42ae88fee5e8b73
  │   20:     0x7f9cea9a376b - std::panicking::try::do_call::h0ae761b9e3a0cc1e
  │   21:     0x7f9ceb31433a - panic_unwind::__rust_maybe_catch_panic
  │                         at /checkout/src/libpanic_unwind/lib.rs:98
  │   22:     0x7f9cea9a40e7 - <F as alloc::boxed::FnBox<A>>::call_box::h91b4e629ac890bb2
  │   23:     0x7f9ceb30bd95 - alloc::boxed::{{impl}}::call_once<(),()>
  │                         at /checkout/src/liballoc/boxed.rs:658
  │                          - std::sys_common::thread::start_thread
  │                         at /checkout/src/libstd/sys_common/thread.rs:21
  │                          - std::sys::imp::thread::{{impl}}::new::thread_start
  │                         at /checkout/src/libstd/sys/unix/thread.rs:84
  │   24:     0x7f9ce71b2183 - start_thread
  │   25:     0x7f9ce6cc9bec - clone
  │   26:                0x0 - <unknown>
  │ ERROR:servo: already immutably borrowed
  └ Pipeline failed in hard-fail mode.  Crashing!
@jdm
Copy link
Member

jdm commented May 21, 2017

Yuck, these changes can't possibly have caused those panics.
@jdm
Copy link
Member

jdm commented May 21, 2017

@bors-servo: retry

  • 16982
@bors-servo
Copy link
Contributor

bors-servo commented May 21, 2017

⌛ Testing commit a8b0a55 with merge c6c3adc...
bors-servo added a commit that referenced this pull request May 21, 2017
@bors-servo
Auto merge of #16956 - mbrubeck:cleanup, r=Manishearth
Loading status checks…
c6c3adc 
stylo: Use correct counts when copying from image layers.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they are code cleanup.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16956)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 21, 2017

💔 Test failed - linux-rel-wpt
@jdm
Copy link
Member

jdm commented May 21, 2017

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

bors-servo commented May 21, 2017

⌛ Testing commit a8b0a55 with merge 460c90a...
bors-servo added a commit that referenced this pull request May 21, 2017
@bors-servo
Auto merge of #16956 - mbrubeck:cleanup, r=Manishearth
Loading status checks…
460c90a 
stylo: Use correct counts when copying from image layers.

---

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because they are code cleanup.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16956)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 21, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-msvc-dev
Approved by: Manishearth
Pushing 460c90a to master...
@bors-servo bors-servo merged commit a8b0a55 into servo:master May 21, 2017
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Manishearth Manishearth

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@mbrubeck @highfive @bors-servo @jdm @Manishearth @KiChjang
You can’t perform that action at this time.