зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1398241 - Update bindings.rs for interfaces changed in WR cset 02e21a58. r=kats
MozReview-Commit-ID: Aq6jP4tcuoU --HG-- extra : rebase_source : eb5c3ada835582c8c18b8821fff5829d869933b1
This commit is contained in:
Morris Tseng
Родитель
b50b7e8eda
Коммит
d4f068b487
|
|
@ -1067,10 +1067,16 @@ pub extern "C" fn wr_dp_begin(state: &mut WrState,
|
|||
let bounds = LayoutRect::new(LayoutPoint::new(0.0, 0.0),
|
||||
LayoutSize::new(width as f32, height as f32));
|
||||
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: bounds,
|
||||
local_clip: None,
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_stacking_context(webrender_api::ScrollPolicy::Scrollable,
|
||||
bounds,
|
||||
.push_stacking_context(&prim_info,
|
||||
webrender_api::ScrollPolicy::Scrollable,
|
||||
None,
|
||||
TransformStyle::Flat,
|
||||
None,
|
||||
|
|
@ -1135,10 +1141,17 @@ pub extern "C" fn wr_dp_push_stacking_context(state: &mut WrState,
|
|||
Some(perspective) => Some(perspective.clone()),
|
||||
None => None,
|
||||
};
|
||||
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: bounds,
|
||||
local_clip: None,
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_stacking_context(webrender_api::ScrollPolicy::Scrollable,
|
||||
bounds,
|
||||
.push_stacking_context(&prim_info,
|
||||
webrender_api::ScrollPolicy::Scrollable,
|
||||
transform_binding,
|
||||
transform_style,
|
||||
perspective,
|
||||
|
|
@ -1253,7 +1266,13 @@ pub extern "C" fn wr_dp_push_iframe(state: &mut WrState,
|
|||
pipeline_id: WrPipelineId) {
|
||||
assert!(unsafe { is_in_main_thread() });
|
||||
|
||||
state.frame_builder.dl_builder.push_iframe(rect, None, pipeline_id);
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: rect,
|
||||
local_clip: None,
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder.dl_builder.push_iframe(&prim_info, pipeline_id);
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
|
|
@ -1263,8 +1282,13 @@ pub extern "C" fn wr_dp_push_rect(state: &mut WrState,
|
|||
color: ColorF) {
|
||||
assert!(unsafe { !is_in_render_thread() });
|
||||
|
||||
state.frame_builder.dl_builder.push_rect(rect,
|
||||
Some(LocalClip::Rect(clip)),
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: rect,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder.dl_builder.push_rect(&prim_info,
|
||||
color);
|
||||
}
|
||||
|
||||
|
|
@ -1278,10 +1302,15 @@ pub extern "C" fn wr_dp_push_image(state: &mut WrState,
|
|||
key: WrImageKey) {
|
||||
assert!(unsafe { is_in_main_thread() || is_in_compositor_thread() });
|
||||
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: bounds,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_image(bounds,
|
||||
Some(LocalClip::Rect(clip)),
|
||||
.push_image(&prim_info,
|
||||
stretch_size,
|
||||
tile_spacing,
|
||||
image_rendering,
|
||||
|
|
@ -1300,10 +1329,15 @@ pub extern "C" fn wr_dp_push_yuv_planar_image(state: &mut WrState,
|
|||
image_rendering: ImageRendering) {
|
||||
assert!(unsafe { is_in_main_thread() || is_in_compositor_thread() });
|
||||
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: bounds,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_yuv_image(bounds,
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_yuv_image(&prim_info,
|
||||
YuvData::PlanarYCbCr(image_key_0, image_key_1, image_key_2),
|
||||
color_space,
|
||||
image_rendering);
|
||||
|
|
@ -1320,10 +1354,15 @@ pub extern "C" fn wr_dp_push_yuv_NV12_image(state: &mut WrState,
|
|||
image_rendering: ImageRendering) {
|
||||
assert!(unsafe { is_in_main_thread() || is_in_compositor_thread() });
|
||||
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: bounds,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_yuv_image(bounds,
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_yuv_image(&prim_info,
|
||||
YuvData::NV12(image_key_0, image_key_1),
|
||||
color_space,
|
||||
image_rendering);
|
||||
|
|
@ -1339,10 +1378,15 @@ pub extern "C" fn wr_dp_push_yuv_interleaved_image(state: &mut WrState,
|
|||
image_rendering: ImageRendering) {
|
||||
assert!(unsafe { is_in_main_thread() || is_in_compositor_thread() });
|
||||
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: bounds,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_yuv_image(bounds,
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_yuv_image(&prim_info,
|
||||
YuvData::InterleavedYCbCr(image_key_0),
|
||||
color_space,
|
||||
image_rendering);
|
||||
|
|
@ -1361,10 +1405,15 @@ pub extern "C" fn wr_dp_push_text(state: &mut WrState,
|
|||
|
||||
let glyph_slice = make_slice(glyphs, glyph_count as usize);
|
||||
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: bounds,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_text(bounds,
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_text(&prim_info,
|
||||
&glyph_slice,
|
||||
font_key,
|
||||
color,
|
||||
|
|
@ -1378,7 +1427,13 @@ pub extern "C" fn wr_dp_push_text_shadow(state: &mut WrState,
|
|||
shadow: TextShadow) {
|
||||
assert!(unsafe { is_in_main_thread() });
|
||||
|
||||
state.frame_builder.dl_builder.push_text_shadow(bounds, Some(LocalClip::Rect(clip.into())), shadow.into());
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: bounds,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder.dl_builder.push_text_shadow(&prim_info, shadow.into());
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
|
|
@ -1400,9 +1455,15 @@ pub extern "C" fn wr_dp_push_line(state: &mut WrState,
|
|||
style: LineStyle) {
|
||||
assert!(unsafe { is_in_main_thread() });
|
||||
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: LayoutRect::zero(),
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_line(Some(LocalClip::Rect(clip.into())),
|
||||
.push_line(&prim_info,
|
||||
baseline,
|
||||
start,
|
||||
end,
|
||||
|
|
@ -1432,10 +1493,15 @@ pub extern "C" fn wr_dp_push_border(state: &mut WrState,
|
|||
bottom: bottom.into(),
|
||||
radius: radius.into(),
|
||||
});
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: rect,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_border(rect,
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_border(&prim_info,
|
||||
widths,
|
||||
border_details);
|
||||
}
|
||||
|
|
@ -1460,10 +1526,15 @@ pub extern "C" fn wr_dp_push_border_image(state: &mut WrState,
|
|||
repeat_horizontal: repeat_horizontal.into(),
|
||||
repeat_vertical: repeat_vertical.into(),
|
||||
});
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: rect,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_border(rect.into(),
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_border(&prim_info,
|
||||
widths.into(),
|
||||
border_details);
|
||||
}
|
||||
|
|
@ -1494,10 +1565,15 @@ pub extern "C" fn wr_dp_push_border_gradient(state: &mut WrState,
|
|||
extend_mode.into()),
|
||||
outset: outset.into(),
|
||||
});
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: rect,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_border(rect.into(),
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_border(&prim_info,
|
||||
widths.into(),
|
||||
border_details);
|
||||
}
|
||||
|
|
@ -1529,10 +1605,15 @@ pub extern "C" fn wr_dp_push_border_radial_gradient(state: &mut WrState,
|
|||
extend_mode.into()),
|
||||
outset: outset.into(),
|
||||
});
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: rect,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_border(rect.into(),
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_border(&prim_info,
|
||||
widths.into(),
|
||||
border_details);
|
||||
}
|
||||
|
|
@ -1559,10 +1640,15 @@ pub extern "C" fn wr_dp_push_linear_gradient(state: &mut WrState,
|
|||
end_point.into(),
|
||||
stops_vector,
|
||||
extend_mode.into());
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: rect,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_gradient(rect.into(),
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_gradient(&prim_info,
|
||||
gradient,
|
||||
tile_size.into(),
|
||||
tile_spacing.into());
|
||||
|
|
@ -1590,10 +1676,15 @@ pub extern "C" fn wr_dp_push_radial_gradient(state: &mut WrState,
|
|||
radius.into(),
|
||||
stops_vector,
|
||||
extend_mode.into());
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: rect,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_radial_gradient(rect,
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_radial_gradient(&prim_info,
|
||||
gradient,
|
||||
tile_size,
|
||||
tile_spacing);
|
||||
|
|
@ -1612,10 +1703,15 @@ pub extern "C" fn wr_dp_push_box_shadow(state: &mut WrState,
|
|||
clip_mode: BoxShadowClipMode) {
|
||||
assert!(unsafe { is_in_main_thread() });
|
||||
|
||||
let prim_info = LayoutPrimitiveInfo {
|
||||
rect: rect,
|
||||
local_clip: Some(LocalClip::Rect(clip.into())),
|
||||
is_backface_visible: true,
|
||||
};
|
||||
|
||||
state.frame_builder
|
||||
.dl_builder
|
||||
.push_box_shadow(rect,
|
||||
Some(LocalClip::Rect(clip.into())),
|
||||
.push_box_shadow(&prim_info,
|
||||
box_bounds,
|
||||
offset,
|
||||
color,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче