Bug 1358156 - Remove z-index related goop, since it's no longer needed as of c872232. r?jrmuizel
MozReview-Commit-ID: 7euzLXUTNgo
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -1160,27 +1160,25 @@ impl WebRenderFrameBuilder {
root_pipeline_id: root_pipeline_id,
dl_builder: webrender_traits::DisplayListBuilder::new(root_pipeline_id),
}
}
}
pub struct WrState {
pipeline_id: WrPipelineId,
- z_index: i32,
frame_builder: WebRenderFrameBuilder,
}
#[no_mangle]
pub extern "C" fn wr_state_new(pipeline_id: WrPipelineId) -> *mut WrState {
assert!(unsafe { is_in_main_thread() });
let state = Box::new(WrState {
pipeline_id: pipeline_id,
- z_index: 0,
frame_builder: WebRenderFrameBuilder::new(pipeline_id),
});
Box::into_raw(state)
}
/// cbindgen:function-postfix=WR_DESTRUCTOR_SAFE_FUNC
#[no_mangle]
@@ -1193,26 +1191,24 @@ pub extern "C" fn wr_state_delete(state:
}
#[no_mangle]
pub extern "C" fn wr_dp_begin(state: &mut WrState,
width: u32,
height: u32) {
assert!(unsafe { is_in_main_thread() });
state.frame_builder.dl_builder.list.clear();
- state.z_index = 0;
let bounds = LayoutRect::new(LayoutPoint::new(0.0, 0.0),
LayoutSize::new(width as f32, height as f32));
state.frame_builder
.dl_builder
.push_stacking_context(webrender_traits::ScrollPolicy::Scrollable,
bounds,
- 0,
None,
TransformStyle::Flat,
None,
MixBlendMode::Normal,
Vec::new());
}
#[no_mangle]
@@ -1243,17 +1239,16 @@ pub extern "C" fn wr_dp_new_clip_region(
#[no_mangle]
pub extern "C" fn wr_dp_push_stacking_context(state: &mut WrState,
bounds: WrRect,
animation_id: u64,
opacity: *const f32,
transform: *const WrMatrix,
mix_blend_mode: WrMixBlendMode) {
assert!(unsafe { is_in_main_thread() });
- state.z_index += 1;
let bounds = bounds.into();
let mut filters: Vec<FilterOp> = Vec::new();
let opacity = unsafe { opacity.as_ref() };
if let Some(opacity) = opacity {
if *opacity < 1.0 {
filters.push(FilterOp::Opacity(PropertyBinding::Value(*opacity)));
@@ -1267,17 +1262,16 @@ pub extern "C" fn wr_dp_push_stacking_co
Some(transform) => PropertyBinding::Value(transform.into()),
None => PropertyBinding::Binding(PropertyBindingKey::new(animation_id)),
};
state.frame_builder
.dl_builder
.push_stacking_context(webrender_traits::ScrollPolicy::Scrollable,
bounds,
- state.z_index,
Some(transform_binding),
TransformStyle::Flat,
None,
mix_blend_mode,
filters);
}
#[no_mangle]