mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
Auto merge of #7487 - mrobinson:paint-layer-upgrade, r=pcwalton
Have PaintLayers own StackingContexts instead of the opposite
Previously, StackingContexts might have a PaintLayer. We switch the
ownership, for several reasons:
* We want PaintLayers to potentially contain something other
than a StackingContext soon.
* We want to delay the creation of PaintLayers until the last
minute, so that we can synthesize new layers for sandwiched
content.
This commit also implements the second goal. Instead of creating
PaintLayers during layout itself, wait until we are sorting and
layerizing a completed DisplayList.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7487)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo
commit
8e0b010117
6 changed files with 198 additions and 161 deletions
|
|
@ -33,7 +33,7 @@ use gfx::display_list::{GradientDisplayItem};
|
|||
use gfx::display_list::{GradientStop, ImageDisplayItem, LineDisplayItem};
|
||||
use gfx::display_list::{OpaqueNode, SolidColorDisplayItem};
|
||||
use gfx::display_list::{StackingContext, TextDisplayItem, TextOrientation};
|
||||
use gfx::paint_task::{PaintLayer, THREAD_TINT_COLORS};
|
||||
use gfx::paint_task::THREAD_TINT_COLORS;
|
||||
use gfx_traits::color;
|
||||
use ipc_channel::ipc::{self, IpcSharedMemory};
|
||||
use msg::compositor_msg::{ScrollPolicy, LayerId};
|
||||
|
|
@ -69,9 +69,9 @@ use util::opts;
|
|||
/// FIXME(pcwalton): This is pretty ugly. Consider modifying `LayerId` somehow.
|
||||
const FAKE_FRAGMENT_ID_FOR_OVERFLOW_SCROLL: u32 = 1000000;
|
||||
|
||||
/// A possible `PaintLayer` for an stacking context
|
||||
pub enum StackingContextLayer {
|
||||
Existing(PaintLayer),
|
||||
/// Whether a stacking context needs a layer or not.
|
||||
pub enum StackingContextLayerNecessity {
|
||||
Always(LayerId, ScrollPolicy),
|
||||
IfCanvas(LayerId),
|
||||
}
|
||||
|
||||
|
|
@ -261,7 +261,7 @@ pub trait FragmentDisplayListBuilding {
|
|||
base_flow: &BaseFlow,
|
||||
display_list: Box<DisplayList>,
|
||||
layout_context: &LayoutContext,
|
||||
layer: StackingContextLayer,
|
||||
needs_layer: StackingContextLayerNecessity,
|
||||
mode: StackingContextCreationMode)
|
||||
-> Arc<StackingContext>;
|
||||
|
||||
|
|
@ -1152,7 +1152,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||
base_flow: &BaseFlow,
|
||||
display_list: Box<DisplayList>,
|
||||
layout_context: &LayoutContext,
|
||||
layer: StackingContextLayer,
|
||||
needs_layer: StackingContextLayerNecessity,
|
||||
mode: StackingContextCreationMode)
|
||||
-> Arc<StackingContext> {
|
||||
let border_box = match mode {
|
||||
|
|
@ -1266,13 +1266,14 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||
}
|
||||
|
||||
// Ensure every canvas has a layer
|
||||
let layer = match layer {
|
||||
StackingContextLayer::Existing(existing_layer) => Some(existing_layer),
|
||||
StackingContextLayer::IfCanvas(layer_id) => {
|
||||
let (scroll_policy, layer_id) = match needs_layer {
|
||||
StackingContextLayerNecessity::Always(layer_id, scroll_policy) =>
|
||||
(scroll_policy, Some(layer_id)),
|
||||
StackingContextLayerNecessity::IfCanvas(layer_id) => {
|
||||
if let SpecificFragmentInfo::Canvas(_) = self.specific {
|
||||
Some(PaintLayer::new(layer_id, color::transparent(), ScrollPolicy::Scrollable))
|
||||
(ScrollPolicy::Scrollable, Some(layer_id))
|
||||
} else {
|
||||
None
|
||||
(ScrollPolicy::Scrollable, None)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -1280,7 +1281,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||
// If it's a canvas we must propagate the layer and the renderer to the paint
|
||||
// task
|
||||
if let SpecificFragmentInfo::Canvas(ref fragment_info) = self.specific {
|
||||
let layer_id = layer.as_ref().unwrap().id;
|
||||
let layer_id = layer_id.unwrap();
|
||||
if let Some(ref ipc_renderer) = fragment_info.ipc_renderer {
|
||||
layout_context.shared
|
||||
.canvas_layers_sender
|
||||
|
|
@ -1299,11 +1300,12 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||
self.style().get_box().z_index.number_or_zero(),
|
||||
filters,
|
||||
self.style().get_effects().mix_blend_mode,
|
||||
layer,
|
||||
transform,
|
||||
perspective,
|
||||
establishes_3d_context,
|
||||
scrolls_overflow_area))
|
||||
scrolls_overflow_area,
|
||||
scroll_policy,
|
||||
layer_id))
|
||||
}
|
||||
|
||||
#[inline(never)]
|
||||
|
|
@ -1576,15 +1578,11 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
|
|||
ScrollPolicy::Scrollable
|
||||
};
|
||||
|
||||
let paint_layer = PaintLayer::new(self.layer_id(0),
|
||||
color::transparent(),
|
||||
scroll_policy);
|
||||
let layer = StackingContextLayer::Existing(paint_layer);
|
||||
let stacking_context = self.fragment.create_stacking_context(
|
||||
&self.base,
|
||||
display_list,
|
||||
layout_context,
|
||||
layer,
|
||||
StackingContextLayerNecessity::Always(self.layer_id(0), scroll_policy),
|
||||
StackingContextCreationMode::Normal);
|
||||
DisplayListBuildingResult::StackingContext(stacking_context)
|
||||
} else if self.fragment.establishes_stacking_context() {
|
||||
|
|
@ -1593,7 +1591,7 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
|
|||
&self.base,
|
||||
display_list,
|
||||
layout_context,
|
||||
StackingContextLayer::IfCanvas(self.layer_id(0)),
|
||||
StackingContextLayerNecessity::IfCanvas(self.layer_id(0)),
|
||||
StackingContextCreationMode::Normal))
|
||||
} else {
|
||||
match self.fragment.style.get_box().position {
|
||||
|
|
@ -1670,7 +1668,7 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
|
|||
&self.base,
|
||||
display_list,
|
||||
layout_context,
|
||||
StackingContextLayer::IfCanvas(self.layer_id(0)),
|
||||
StackingContextLayerNecessity::IfCanvas(self.layer_id(0)),
|
||||
StackingContextCreationMode::Normal));
|
||||
}
|
||||
return
|
||||
|
|
@ -1694,26 +1692,22 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
|
|||
} else {
|
||||
self.layer_id(0)
|
||||
};
|
||||
let paint_layer = PaintLayer::new(layer_id, color::transparent(), scroll_policy);
|
||||
let stacking_context = self.fragment.create_stacking_context(
|
||||
&self.base,
|
||||
display_list,
|
||||
layout_context,
|
||||
StackingContextLayer::Existing(paint_layer),
|
||||
StackingContextLayerNecessity::Always(layer_id, scroll_policy),
|
||||
stacking_context_creation_mode);
|
||||
|
||||
let outermost_stacking_context = match outer_display_list_for_overflow_scroll {
|
||||
Some(mut outer_display_list_for_overflow_scroll) => {
|
||||
outer_display_list_for_overflow_scroll.children.push_back(stacking_context);
|
||||
|
||||
let paint_layer = PaintLayer::new(self.layer_id(0),
|
||||
color::transparent(),
|
||||
scroll_policy);
|
||||
self.fragment.create_stacking_context(
|
||||
&self.base,
|
||||
outer_display_list_for_overflow_scroll,
|
||||
layout_context,
|
||||
StackingContextLayer::Existing(paint_layer),
|
||||
StackingContextLayerNecessity::Always(self.layer_id(0), scroll_policy),
|
||||
StackingContextCreationMode::OuterScrollWrapper)
|
||||
}
|
||||
None => stacking_context,
|
||||
|
|
@ -1739,7 +1733,7 @@ impl BlockFlowDisplayListBuilding for BlockFlow {
|
|||
&self.base,
|
||||
display_list,
|
||||
layout_context,
|
||||
StackingContextLayer::IfCanvas(self.layer_id(0)),
|
||||
StackingContextLayerNecessity::IfCanvas(self.layer_id(0)),
|
||||
StackingContextCreationMode::Normal))
|
||||
} else {
|
||||
DisplayListBuildingResult::Normal(display_list)
|
||||
|
|
@ -1839,7 +1833,7 @@ impl InlineFlowDisplayListBuilding for InlineFlow {
|
|||
&self.base,
|
||||
display_list,
|
||||
layout_context,
|
||||
StackingContextLayer::IfCanvas(self.layer_id(0)),
|
||||
StackingContextLayerNecessity::IfCanvas(self.layer_id(0)),
|
||||
StackingContextCreationMode::Normal))
|
||||
} else {
|
||||
DisplayListBuildingResult::Normal(display_list)
|
||||
|
|
|
|||
|
|
@ -1033,22 +1033,23 @@ impl LayoutTask {
|
|||
flow::mut_base(flow_ref::deref_mut(layout_root))
|
||||
.display_list_building_result
|
||||
.add_to(&mut *display_list);
|
||||
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 layer_id = layout_root.layer_id(0);
|
||||
let stacking_context = Arc::new(StackingContext::new(display_list,
|
||||
&origin,
|
||||
&origin,
|
||||
0,
|
||||
filter::T::new(Vec::new()),
|
||||
mix_blend_mode::T::normal,
|
||||
Some(paint_layer),
|
||||
Matrix4::identity(),
|
||||
Matrix4::identity(),
|
||||
true,
|
||||
false));
|
||||
false,
|
||||
ScrollPolicy::Scrollable,
|
||||
Some(layer_id)));
|
||||
let paint_layer = PaintLayer::new(layer_id,
|
||||
root_background_color,
|
||||
stacking_context.clone());
|
||||
|
||||
if opts::get().dump_display_list {
|
||||
println!("#### start printing display list.");
|
||||
|
|
@ -1058,13 +1059,13 @@ impl LayoutTask {
|
|||
println!("{}", serde_json::to_string_pretty(&stacking_context).unwrap());
|
||||
}
|
||||
|
||||
rw_data.stacking_context = Some(stacking_context.clone());
|
||||
rw_data.stacking_context = Some(stacking_context);
|
||||
|
||||
debug!("Layout done!");
|
||||
|
||||
rw_data.epoch.next();
|
||||
self.paint_chan
|
||||
.send(LayoutToPaintMsg::PaintInit(rw_data.epoch, stacking_context))
|
||||
.send(LayoutToPaintMsg::PaintInit(rw_data.epoch, paint_layer))
|
||||
.unwrap();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue