Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

layout_thread: Simplify needs_dirtying setup.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-03-03 01:00:24 +01:00
parent 71997e6ed9
commit 072f93e41e
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/layout_thread/lib.rs
View file

@ -1031,9 +1031,6 @@ impl LayoutThread {
Au::from_f32_px(constraints.size.height)) Au::from_f32_px(constraints.size.height))
}); });
// Handle conditions where the entire flow tree is invalid.
let mut needs_dirtying = false;
let viewport_size_changed = self.viewport_size != old_viewport_size; let viewport_size_changed = self.viewport_size != old_viewport_size;
if viewport_size_changed { if viewport_size_changed {
if let Some(constraints) = rw_data.stylist.viewport_constraints() { if let Some(constraints) = rw_data.stylist.viewport_constraints() {
@ -1067,9 +1064,9 @@ impl LayoutThread {
} }
// If the entire flow tree is invalid, then it will be reflowed anyhow. // If the entire flow tree is invalid, then it will be reflowed anyhow.
needs_dirtying |= Arc::get_mut(&mut rw_data.stylist).unwrap().update(&data.document_stylesheets, let needs_dirtying = Arc::get_mut(&mut rw_data.stylist).unwrap().update(&data.document_stylesheets,
Some(&*UA_STYLESHEETS), Some(&*UA_STYLESHEETS),
data.stylesheets_changed); data.stylesheets_changed);
let needs_reflow = viewport_size_changed && !needs_dirtying; let needs_reflow = viewport_size_changed && !needs_dirtying;
if needs_dirtying { if needs_dirtying {
if let Some(mut d) = element.mutate_data() { if let Some(mut d) = element.mutate_data() {