Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions webrender/src/frame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,12 @@ impl Frame {
let layer_rect = LayerRect::new(LayerPoint::zero(),
LayerSize::new(content_size.width + clip.origin.x,
content_size.height + clip.origin.y));
context.builder.push_layer(layer_rect,
&ClipRegion::simple(&layer_rect),
LayerToScrollTransform::identity(),
pipeline_id,
current_scroll_layer_id,
CompositeOps::empty());
context.builder.push_stacking_context(layer_rect,
&ClipRegion::simple(&layer_rect),
LayerToScrollTransform::identity(),
pipeline_id,
current_scroll_layer_id,
CompositeOps::empty());

self.flatten_items(traversal,
pipeline_id,
Expand All @@ -336,7 +336,7 @@ impl Frame {
LayerToScrollTransform::identity(),
level);

context.builder.pop_layer();
context.builder.pop_stacking_context();
}

fn flatten_stacking_context<'a>(&mut self,
Expand Down Expand Up @@ -400,12 +400,12 @@ impl Frame {

// Adding a dummy layer for this rectangle in order to disable clipping.
let no_clip = ClipRegion::simple(&clip_region.main);
context.builder.push_layer(clip_region.main,
&no_clip,
transform,
pipeline_id,
scroll_layer_id,
CompositeOps::empty());
context.builder.push_stacking_context(clip_region.main,
&no_clip,
transform,
pipeline_id,
scroll_layer_id,
CompositeOps::empty());

//Note: we don't use the original clip region here,
// it's already processed by the layer we just pushed.
Expand All @@ -414,18 +414,18 @@ impl Frame {
&bg_color,
PrimitiveFlags::None);

context.builder.pop_layer();
context.builder.pop_stacking_context();
}
}
}

// TODO(gw): Int with overflow etc
context.builder.push_layer(clip_region.main,
&clip_region,
transform,
pipeline_id,
scroll_layer_id,
composition_operations);
context.builder.push_stacking_context(clip_region.main,
&clip_region,
transform,
pipeline_id,
scroll_layer_id,
composition_operations);

self.flatten_items(traversal,
pipeline_id,
Expand All @@ -444,7 +444,7 @@ impl Frame {
PrimitiveFlags::Scrollbar(self.scroll_tree.topmost_scroll_layer_id, 4.0));
}

context.builder.pop_layer();
context.builder.pop_stacking_context();
}

fn flatten_iframe<'a>(&mut self,
Expand Down
Loading