@@ -158,13 +158,13 @@ pub struct PictureCacheKey {
158
158
159
159
/// Enum value describing the place of a picture in a 3D context.
160
160
#[ derive( Clone , Debug ) ]
161
- pub enum Picture3DContext < R > {
161
+ pub enum Picture3DContext < C > {
162
162
/// The picture is not a part of 3D context sub-hierarchy.
163
163
Out ,
164
164
/// The picture is a part of 3D context.
165
165
In {
166
- /// Additional data for the case of this a root of 3D hierarchy.
167
- root_data : Option < R > ,
166
+ /// Additional data per child for the case of this a root of 3D hierarchy.
167
+ root_data : Option < Vec < C > > ,
168
168
/// The spatial node index of an "ancestor" element, i.e. one
169
169
/// that establishes the transformed element’s containing block.
170
170
///
@@ -210,7 +210,7 @@ pub struct PicturePrimitive {
210
210
pub requested_raster_space : RasterSpace ,
211
211
212
212
pub raster_config : Option < RasterConfig > ,
213
- pub context_3d : Picture3DContext < Vec < OrderedPictureChild > > ,
213
+ pub context_3d : Picture3DContext < OrderedPictureChild > ,
214
214
215
215
// If requested as a frame output (for rendering
216
216
// pages to a texture), this is the pipeline this
@@ -245,7 +245,7 @@ impl PicturePrimitive {
245
245
pub fn new_image (
246
246
id : PictureId ,
247
247
requested_composite_mode : Option < PictureCompositeMode > ,
248
- context_3d : Picture3DContext < Vec < OrderedPictureChild > > ,
248
+ context_3d : Picture3DContext < OrderedPictureChild > ,
249
249
pipeline_id : PipelineId ,
250
250
frame_output_pipeline_id : Option < PipelineId > ,
251
251
apply_local_clip_rect : bool ,
0 commit comments