mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Auto merge of #20058 - Eijebong:rayon1.0, r=jdm
Bump rayon to 1.0 <!-- 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/20058) <!-- Reviewable:end -->
This commit is contained in:
commit
b6bd719c5d
17 changed files with 163 additions and 96 deletions
|
@ -33,7 +33,7 @@ net_traits = {path = "../net_traits"}
|
|||
parking_lot = "0.4"
|
||||
profile_traits = {path = "../profile_traits"}
|
||||
range = {path = "../range"}
|
||||
rayon = "0.8"
|
||||
rayon = "1"
|
||||
script = {path = "../script"}
|
||||
script_layout_interface = {path = "../script_layout_interface"}
|
||||
script_traits = {path = "../script_traits"}
|
||||
|
|
|
@ -457,11 +457,12 @@ impl LayoutThread {
|
|||
opts::get().initial_window_size.to_f32() * TypedScale::new(1.0),
|
||||
TypedScale::new(opts::get().device_pixels_per_px.unwrap_or(1.0)));
|
||||
|
||||
let configuration =
|
||||
rayon::Configuration::new().num_threads(layout_threads)
|
||||
.start_handler(|_| thread_state::initialize_layout_worker_thread());
|
||||
let workers =
|
||||
rayon::ThreadPoolBuilder::new().num_threads(layout_threads)
|
||||
.start_handler(|_| thread_state::initialize_layout_worker_thread())
|
||||
.build();
|
||||
let parallel_traversal = if layout_threads > 1 {
|
||||
Some(rayon::ThreadPool::new(configuration).expect("ThreadPool creation failed"))
|
||||
Some(workers.expect("ThreadPool creation failed"))
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
@ -709,7 +710,7 @@ impl LayoutThread {
|
|||
let mut txn = webrender_api::Transaction::new();
|
||||
txn.scroll_node_with_id(
|
||||
webrender_api::LayoutPoint::from_untyped(&point),
|
||||
webrender_api::ScrollNodeIdType::ExternalScrollId(state.scroll_id),
|
||||
state.scroll_id,
|
||||
webrender_api::ScrollClamping::ToContentBounds
|
||||
);
|
||||
self.webrender_api.send_transaction(self.webrender_document, txn);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue