From 70b436796af7480ae4c6f44825b544f85e60fc4e Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Thu, 30 Jun 2022 20:38:14 +0000 Subject: [PATCH] Bug 1777395 - Remove legacy clip-parenting in wrench r=gfx-reviewers,lsalzman This removes the last piece of code in wrench and gecko (there is one more callsite in WR itself) that relies on the legacy clip parenting code. Differential Revision: https://phabricator.services.mozilla.com/D150694 --- gfx/wr/wrench/reftests/tiles/tile-cache-raster-root.yaml | 2 ++ gfx/wr/wrench/src/yaml_frame_reader.rs | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gfx/wr/wrench/reftests/tiles/tile-cache-raster-root.yaml b/gfx/wr/wrench/reftests/tiles/tile-cache-raster-root.yaml index 502f8ff0c937..9c80afd7bcf3 100644 --- a/gfx/wr/wrench/reftests/tiles/tile-cache-raster-root.yaml +++ b/gfx/wr/wrench/reftests/tiles/tile-cache-raster-root.yaml @@ -39,3 +39,5 @@ pipelines: bounds: [0, 0, 1887, 239] type: rect color: blue + clip-chain: [2, 4] + \ No newline at end of file diff --git a/gfx/wr/wrench/src/yaml_frame_reader.rs b/gfx/wr/wrench/src/yaml_frame_reader.rs index 29b3f9bead5e..b9429747749b 100644 --- a/gfx/wr/wrench/src/yaml_frame_reader.rs +++ b/gfx/wr/wrench/src/yaml_frame_reader.rs @@ -1894,7 +1894,10 @@ impl YamlFrameReader { if let Some(clip_rect) = yaml["bounds"].as_rect() { space_and_clip.clip_id = dl.define_clip_rect( - &space_and_clip, + &SpaceAndClipInfo { + spatial_id: space_and_clip.spatial_id, + clip_id: ClipId::ClipChain(ClipChainId::INVALID), + }, clip_rect, ); }