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

Fix filter clipping caused by overflow: hidden (#30517)

Browse source 
* Partially fix filter clipping

* Clean up the logic

* Update components/layout_2020/display_list/stacking_context.rs

---------

Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Ennui Langeweile 2023-10-09 09:51:51 -03:00 • committed by GitHub
parent 5eed4e978c
commit 84dd447d9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/layout_2020/display_list/stacking_context.rs
View file

@ -271,6 +271,9 @@ pub struct StackingContext {
/// things like preserve-3d.
spatial_id: wr::SpatialId,
/// The clip chain id of this stacking context if it has one. Used for filter clipping.
clip_chain_id: Option<wr::ClipChainId>,
/// The fragment that established this stacking context.
initializing_fragment_style: Option<ServoArc<ComputedValues>>,
@ -330,11 +333,13 @@ impl StackingContext {
fn create_descendant(
&self,
spatial_id: wr::SpatialId,
clip_chain_id: Option<wr::ClipChainId>,
initializing_fragment_style: ServoArc<ComputedValues>,
context_type: StackingContextType,
) -> Self {
Self {
spatial_id,
clip_chain_id: clip_chain_id,
initializing_fragment_style: Some(initializing_fragment_style),
context_type,
contents: vec![],
@ -348,6 +353,7 @@ impl StackingContext {
pub(crate) fn create_root(wr: &wr::DisplayListBuilder, debug: &DebugOptions) -> Self {
Self {
spatial_id: wr::SpaceAndClipInfo::root_scroll(wr.pipeline_id).spatial_id,
clip_chain_id: None,
initializing_fragment_style: None,
context_type: StackingContextType::RealStackingContext,
contents: vec![],
@ -430,6 +436,8 @@ impl StackingContext {
return false;
}
let clip_id = self.clip_chain_id.map(wr::ClipId::ClipChain);
// Create the filter pipeline.
let current_color = style.clone_color();
let mut filters: Vec<wr::FilterOp> = effects
@ -455,7 +463,7 @@ impl StackingContext {
LayoutPoint::zero(), // origin
self.spatial_id,
style.get_webrender_primitive_flags(),
None, // clip_chain_id
clip_id,
style.get_used_transform_style().to_webrender(),
effects.mix_blend_mode.to_webrender(),
&filters,
@ -982,6 +990,7 @@ impl BoxFragment {
let mut child_stacking_context = parent_stacking_context.create_descendant(
containing_block.scroll_node_id.spatial_id,
Some(containing_block.clip_chain_id),
self.style.clone(),
context_type,
);