diff --git a/webrender/src/frame.rs b/webrender/src/frame.rs index ac5b4a01d2..d62f82eec1 100644 --- a/webrender/src/frame.rs +++ b/webrender/src/frame.rs @@ -61,7 +61,6 @@ impl<'a> FlattenContext<'a> { pub struct Frame { pub clip_scroll_tree: ClipScrollTree, pub pipeline_epoch_map: HashMap>, - pub pipeline_auxiliary_lists: AuxiliaryListsMap, id: FrameId, frame_builder_config: FrameBuilderConfig, frame_builder: Option, @@ -226,7 +225,6 @@ impl Frame { pub fn new(config: FrameBuilderConfig) -> Frame { Frame { pipeline_epoch_map: HashMap::default(), - pipeline_auxiliary_lists: HashMap::default(), clip_scroll_tree: ClipScrollTree::new(), id: FrameId(0), frame_builder: None, @@ -296,7 +294,6 @@ impl Frame { } let old_scrolling_states = self.reset(); - self.pipeline_auxiliary_lists = scene.pipeline_auxiliary_lists.clone(); self.pipeline_epoch_map.insert(root_pipeline_id, root_pipeline.epoch); @@ -381,9 +378,9 @@ impl Frame { } let composition_operations = { - let auxiliary_lists = self.pipeline_auxiliary_lists - .get(&pipeline_id) - .expect("No auxiliary lists?!"); + let auxiliary_lists = context.scene.pipeline_auxiliary_lists + .get(&pipeline_id) + .expect("No auxiliary lists?!"); CompositeOps::new( stacking_context.filter_ops_for_compositing(auxiliary_lists, &context.scene.properties), stacking_context.mix_blend_mode_for_compositing()) @@ -609,9 +606,9 @@ impl Frame { text_info.glyph_options); } SpecificDisplayItem::Rectangle(ref info) => { - let auxiliary_lists = self.pipeline_auxiliary_lists - .get(&pipeline_id) - .expect("No auxiliary lists?!"); + let auxiliary_lists = context.scene.pipeline_auxiliary_lists + .get(&pipeline_id) + .expect("No auxiliary lists?!"); // Try to extract the opaque inner rectangle out of the clipped primitive. if let Some(opaque_rect) = clip_intersection(&item.rect, &item.clip, auxiliary_lists) { let mut results = Vec::new();