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

Auto merge of #9090 - Ms2ger:stylesheets-vec, r=SimonSapin

Browse source 
Don't copy the list of stylesheets in LayoutTask::handle_reflow.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9090)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-31 21:50:22 +05:30
commit 3791447de8
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/layout_task.rs
View file

@ -954,9 +954,6 @@ impl LayoutTask {
node.dump(); node.dump();
} }
let stylesheets: Vec<&Stylesheet> = data.document_stylesheets.iter().map(|entry| &**entry)
.collect();
let stylesheets_changed = data.stylesheets_changed;
let initial_viewport = data.window_size.initial_viewport; let initial_viewport = data.window_size.initial_viewport;
let old_viewport_size = self.viewport_size; let old_viewport_size = self.viewport_size;
let current_screen_size = Size2D::new(Au::from_f32_px(initial_viewport.width.get()), let current_screen_size = Size2D::new(Au::from_f32_px(initial_viewport.width.get()),
@ -964,7 +961,7 @@ impl LayoutTask {
// Calculate the actual viewport as per DEVICE-ADAPT § 6 // Calculate the actual viewport as per DEVICE-ADAPT § 6
let device = Device::new(MediaType::Screen, initial_viewport); let device = Device::new(MediaType::Screen, initial_viewport);
rw_data.stylist.set_device(device, &stylesheets); rw_data.stylist.set_device(device, &data.document_stylesheets);
let constraints = rw_data.stylist.viewport_constraints().clone(); let constraints = rw_data.stylist.viewport_constraints().clone();
self.viewport_size = match constraints { self.viewport_size = match constraints {
@ -990,7 +987,8 @@ impl LayoutTask {
} }
// 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(&stylesheets, stylesheets_changed); let needs_dirtying = rw_data.stylist.update(&data.document_stylesheets,
data.stylesheets_changed);
let needs_reflow = viewport_size_changed && !needs_dirtying; let needs_reflow = viewport_size_changed && !needs_dirtying;
unsafe { unsafe {
if needs_dirtying { if needs_dirtying {

5
components/style/selector_matching.rs
View file

@ -21,6 +21,7 @@ use selectors::parser::PseudoElement;
use selectors::states::*; use selectors::states::*;
use smallvec::VecLike; use smallvec::VecLike;
use std::process; use std::process;
use std::sync::Arc;
use style_traits::viewport::ViewportConstraints; use style_traits::viewport::ViewportConstraints;
use stylesheets::{CSSRuleIteratorExt, Origin, Stylesheet}; use stylesheets::{CSSRuleIteratorExt, Origin, Stylesheet};
use url::Url; use url::Url;
@ -144,7 +145,7 @@ impl Stylist {
stylist stylist
} }
pub fn update(&mut self, doc_stylesheets: &[&Stylesheet], pub fn update(&mut self, doc_stylesheets: &[Arc<Stylesheet>],
stylesheets_changed: bool) -> bool { stylesheets_changed: bool) -> bool {
if !(self.is_device_dirty || stylesheets_changed) { if !(self.is_device_dirty || stylesheets_changed) {
return false; return false;
@ -242,7 +243,7 @@ impl Stylist {
self.state_deps.compute_hint(element, snapshot, current_state) self.state_deps.compute_hint(element, snapshot, current_state)
} }
pub fn set_device(&mut self, mut device: Device, stylesheets: &[&Stylesheet]) { pub fn set_device(&mut self, mut device: Device, stylesheets: &[Arc<Stylesheet>]) {
let cascaded_rule = stylesheets.iter() let cascaded_rule = stylesheets.iter()
.flat_map(|s| s.effective_rules(&self.device).viewport()) .flat_map(|s| s.effective_rules(&self.device).viewport())
.cascade(); .cascade();