mirror of
https://github.com/servo/servo.git
synced 2025-07-23 15:23:42 +01:00
Merge pull request #6988 from glennw/no-arc
No need for paint layer in stacking context to be an arc.
This commit is contained in:
commit
f570da28c2
3 changed files with 5 additions and 6 deletions
|
@ -227,7 +227,7 @@ pub struct StackingContext {
|
|||
|
||||
/// The layer for this stacking context, if there is one.
|
||||
#[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.
|
||||
pub bounds: Rect<Au>,
|
||||
|
@ -263,7 +263,7 @@ impl StackingContext {
|
|||
z_index: i32,
|
||||
filters: filter::T,
|
||||
blend_mode: mix_blend_mode::T,
|
||||
layer: Option<Arc<PaintLayer>>,
|
||||
layer: Option<PaintLayer>,
|
||||
transform: Matrix4,
|
||||
perspective: Matrix4,
|
||||
establishes_3d_context: bool)
|
||||
|
|
|
@ -1255,7 +1255,6 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||
}
|
||||
|
||||
let transform_style = self.style().get_used_transform_style();
|
||||
let layer = layer.map(|l| Arc::new(l));
|
||||
|
||||
Arc::new(StackingContext::new(display_list,
|
||||
&border_box,
|
||||
|
|
|
@ -1072,9 +1072,9 @@ impl LayoutTask {
|
|||
let mut display_list = box DisplayList::new();
|
||||
flow::mut_base(&mut **layout_root).display_list_building_result
|
||||
.add_to(&mut *display_list);
|
||||
let paint_layer = Arc::new(PaintLayer::new(layout_root.layer_id(0),
|
||||
root_background_color,
|
||||
ScrollPolicy::Scrollable));
|
||||
let paint_layer = PaintLayer::new(layout_root.layer_id(0),
|
||||
root_background_color,
|
||||
ScrollPolicy::Scrollable);
|
||||
let origin = Rect::new(Point2D::new(Au(0), Au(0)), root_size);
|
||||
|
||||
let stacking_context = Arc::new(StackingContext::new(display_list,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue