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

Auto merge of #10105 - mbrubeck:dirty-viewport-percentages, r=SimonSapin

Browse source 
Don't re-add stylesheets to recompute vw/vh lengths

This is a follow-up to #9876.  It avoids clearing and rebuilding SelectorMaps
when vh and vw units need to be recomputed. Instead it just dirties all nodes,
to force elements to be re-cascaded.

Filed #10104 for later follow-up work to dirty only affected nodes.

r? @SimonSapin

<!-- 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/10105)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-03-22 18:58:47 +05:30
commit 41060dbdd7
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/layout_thread.rs
View file

@ -1056,6 +1056,8 @@ impl LayoutThread {
}; };
// Handle conditions where the entire flow tree is invalid. // 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) = constraints { if let Some(constraints) = constraints {
@ -1064,10 +1066,14 @@ impl LayoutThread {
constellation_chan.send(ConstellationMsg::ViewportConstrained( constellation_chan.send(ConstellationMsg::ViewportConstrained(
self.id, constraints)).unwrap(); self.id, constraints)).unwrap();
} }
// FIXME (#10104): Only dirty nodes affected by vh/vw/vmin/vmax styles.
if data.document_stylesheets.iter().any(|sheet| sheet.dirty_on_viewport_size_change) {
needs_dirtying = true;
}
} }
// 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.
let needs_dirtying = rw_data.stylist.update(&data.document_stylesheets, needs_dirtying |= rw_data.stylist.update(&data.document_stylesheets,
data.stylesheets_changed); data.stylesheets_changed);
let needs_reflow = viewport_size_changed && !needs_dirtying; let needs_reflow = viewport_size_changed && !needs_dirtying;
unsafe { unsafe {

3
components/style/selector_matching.rs
View file

@ -227,10 +227,7 @@ impl<Impl: SelectorImplExt> Stylist<Impl> {
device = Device::new(MediaType::Screen, constraints.size); device = Device::new(MediaType::Screen, constraints.size);
} }
let size_changed = device.viewport_size != self.device.viewport_size;
self.is_device_dirty |= stylesheets.iter().any(|stylesheet| { self.is_device_dirty |= stylesheets.iter().any(|stylesheet| {
(size_changed && stylesheet.dirty_on_viewport_size_change) ||
stylesheet.rules().media().any(|media_rule| stylesheet.rules().media().any(|media_rule|
media_rule.evaluate(&self.device) != media_rule.evaluate(&device)) media_rule.evaluate(&self.device) != media_rule.evaluate(&device))
}); });