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

Merge pull request #6988 from glennw/no-arc

Browse source 
No need for paint layer in stacking context to be an arc.
This commit is contained in:
Jack Moffitt 2015-08-05 20:06:09 -06:00
commit f570da28c2
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/gfx/display_list/mod.rs
View file

@ -227,7 +227,7 @@ pub struct StackingContext {
/// The layer for this stacking context, if there is one. /// The layer for this stacking context, if there is one.
#[ignore_heap_size_of = "FIXME(njn): should measure this at some point"] #[ignore_heap_size_of = "FIXME(njn): should measure this at some point"]
pub layer: Option<Arc<PaintLayer>>, pub layer: Option<PaintLayer>,
/// The position and size of this stacking context. /// The position and size of this stacking context.
pub bounds: Rect<Au>, pub bounds: Rect<Au>,
@ -263,7 +263,7 @@ impl StackingContext {
z_index: i32, z_index: i32,
filters: filter::T, filters: filter::T,
blend_mode: mix_blend_mode::T, blend_mode: mix_blend_mode::T,
layer: Option<Arc<PaintLayer>>, layer: Option<PaintLayer>,
transform: Matrix4, transform: Matrix4,
perspective: Matrix4, perspective: Matrix4,
establishes_3d_context: bool) establishes_3d_context: bool)

1
components/layout/display_list_builder.rs
View file

@ -1255,7 +1255,6 @@ impl FragmentDisplayListBuilding for Fragment {
} }
let transform_style = self.style().get_used_transform_style(); let transform_style = self.style().get_used_transform_style();
let layer = layer.map(|l| Arc::new(l));
Arc::new(StackingContext::new(display_list, Arc::new(StackingContext::new(display_list,
&border_box, &border_box,

4
components/layout/layout_task.rs
View file

@ -1072,9 +1072,9 @@ impl LayoutTask {
let mut display_list = box DisplayList::new(); let mut display_list = box DisplayList::new();
flow::mut_base(&mut **layout_root).display_list_building_result flow::mut_base(&mut **layout_root).display_list_building_result
.add_to(&mut *display_list); .add_to(&mut *display_list);
let paint_layer = Arc::new(PaintLayer::new(layout_root.layer_id(0), let paint_layer = PaintLayer::new(layout_root.layer_id(0),
root_background_color, root_background_color,
ScrollPolicy::Scrollable)); ScrollPolicy::Scrollable);
let origin = Rect::new(Point2D::new(Au(0), Au(0)), root_size); let origin = Rect::new(Point2D::new(Au(0), Au(0)), root_size);
let stacking_context = Arc::new(StackingContext::new(display_list, let stacking_context = Arc::new(StackingContext::new(display_list,