mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Use the new WebRender conversion functions.
Remove the old ones.
This commit is contained in:
parent
71e542c424
commit
246b54507a
5 changed files with 89 additions and 285 deletions
|
@ -8,16 +8,12 @@
|
|||
// completely converting layout to directly generate WebRender display lists, for example.
|
||||
|
||||
use app_units::Au;
|
||||
use euclid::{Point2D, Rect, SideOffsets2D, Size2D, Vector2D};
|
||||
use display_list::ToLayout;
|
||||
use euclid::Point2D;
|
||||
use gfx::display_list::{BorderDetails, BorderRadii, BoxShadowClipMode, ClipScrollNode};
|
||||
use gfx::display_list::{ClipScrollNodeIndex, ClipScrollNodeType, ClippingRegion, DisplayItem};
|
||||
use gfx::display_list::{DisplayList, StackingContextType};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use style::computed_values::image_rendering::T as ImageRendering;
|
||||
use style::computed_values::mix_blend_mode::T as MixBlendMode;
|
||||
use style::computed_values::transform_style::T as TransformStyle;
|
||||
use style::values::computed::{BorderStyle, Filter};
|
||||
use style::values::generics::effects::Filter as GenericFilter;
|
||||
use webrender_api::{self, ClipAndScrollInfo, ClipId, ClipMode, ComplexClipRegion};
|
||||
use webrender_api::{DisplayListBuilder, ExtendMode, LayoutTransform};
|
||||
|
||||
|
@ -36,42 +32,6 @@ trait WebRenderDisplayItemConverter {
|
|||
);
|
||||
}
|
||||
|
||||
trait ToBorderStyle {
|
||||
fn to_border_style(&self) -> webrender_api::BorderStyle;
|
||||
}
|
||||
|
||||
impl ToBorderStyle for BorderStyle {
|
||||
fn to_border_style(&self) -> webrender_api::BorderStyle {
|
||||
match *self {
|
||||
BorderStyle::None => webrender_api::BorderStyle::None,
|
||||
BorderStyle::Solid => webrender_api::BorderStyle::Solid,
|
||||
BorderStyle::Double => webrender_api::BorderStyle::Double,
|
||||
BorderStyle::Dotted => webrender_api::BorderStyle::Dotted,
|
||||
BorderStyle::Dashed => webrender_api::BorderStyle::Dashed,
|
||||
BorderStyle::Hidden => webrender_api::BorderStyle::Hidden,
|
||||
BorderStyle::Groove => webrender_api::BorderStyle::Groove,
|
||||
BorderStyle::Ridge => webrender_api::BorderStyle::Ridge,
|
||||
BorderStyle::Inset => webrender_api::BorderStyle::Inset,
|
||||
BorderStyle::Outset => webrender_api::BorderStyle::Outset,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
trait ToBorderWidths {
|
||||
fn to_border_widths(&self) -> webrender_api::BorderWidths;
|
||||
}
|
||||
|
||||
impl ToBorderWidths for SideOffsets2D<Au> {
|
||||
fn to_border_widths(&self) -> webrender_api::BorderWidths {
|
||||
webrender_api::BorderWidths {
|
||||
left: self.left.to_f32_px(),
|
||||
top: self.top.to_f32_px(),
|
||||
right: self.right.to_f32_px(),
|
||||
bottom: self.bottom.to_f32_px(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
trait ToBoxShadowClipMode {
|
||||
fn to_clip_mode(&self) -> webrender_api::BoxShadowClipMode;
|
||||
}
|
||||
|
@ -85,52 +45,6 @@ impl ToBoxShadowClipMode for BoxShadowClipMode {
|
|||
}
|
||||
}
|
||||
|
||||
trait ToSizeF {
|
||||
fn to_sizef(&self) -> webrender_api::LayoutSize;
|
||||
}
|
||||
|
||||
trait ToPointF {
|
||||
fn to_pointf(&self) -> webrender_api::LayoutPoint;
|
||||
}
|
||||
|
||||
trait ToVectorF {
|
||||
fn to_vectorf(&self) -> webrender_api::LayoutVector2D;
|
||||
}
|
||||
|
||||
impl ToPointF for Point2D<Au> {
|
||||
fn to_pointf(&self) -> webrender_api::LayoutPoint {
|
||||
webrender_api::LayoutPoint::new(self.x.to_f32_px(), self.y.to_f32_px())
|
||||
}
|
||||
}
|
||||
|
||||
impl ToVectorF for Vector2D<Au> {
|
||||
fn to_vectorf(&self) -> webrender_api::LayoutVector2D {
|
||||
webrender_api::LayoutVector2D::new(self.x.to_f32_px(), self.y.to_f32_px())
|
||||
}
|
||||
}
|
||||
|
||||
impl ToSizeF for Size2D<Au> {
|
||||
fn to_sizef(&self) -> webrender_api::LayoutSize {
|
||||
webrender_api::LayoutSize::new(self.width.to_f32_px(), self.height.to_f32_px())
|
||||
}
|
||||
}
|
||||
|
||||
pub trait ToRectF {
|
||||
fn to_rectf(&self) -> webrender_api::LayoutRect;
|
||||
}
|
||||
|
||||
impl ToRectF for Rect<Au> {
|
||||
fn to_rectf(&self) -> webrender_api::LayoutRect {
|
||||
let x = self.origin.x.to_f32_px();
|
||||
let y = self.origin.y.to_f32_px();
|
||||
let w = self.size.width.to_f32_px();
|
||||
let h = self.size.height.to_f32_px();
|
||||
let point = webrender_api::LayoutPoint::new(x, y);
|
||||
let size = webrender_api::LayoutSize::new(w, h);
|
||||
webrender_api::LayoutRect::new(point, size)
|
||||
}
|
||||
}
|
||||
|
||||
pub trait ToBorderRadius {
|
||||
fn to_border_radius(&self) -> webrender_api::BorderRadius;
|
||||
}
|
||||
|
@ -138,107 +52,10 @@ pub trait ToBorderRadius {
|
|||
impl ToBorderRadius for BorderRadii<Au> {
|
||||
fn to_border_radius(&self) -> webrender_api::BorderRadius {
|
||||
webrender_api::BorderRadius {
|
||||
top_left: self.top_left.to_sizef(),
|
||||
top_right: self.top_right.to_sizef(),
|
||||
bottom_left: self.bottom_left.to_sizef(),
|
||||
bottom_right: self.bottom_right.to_sizef(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub trait ToMixBlendMode {
|
||||
fn to_mix_blend_mode(&self) -> webrender_api::MixBlendMode;
|
||||
}
|
||||
|
||||
impl ToMixBlendMode for MixBlendMode {
|
||||
fn to_mix_blend_mode(&self) -> webrender_api::MixBlendMode {
|
||||
match *self {
|
||||
MixBlendMode::Normal => webrender_api::MixBlendMode::Normal,
|
||||
MixBlendMode::Multiply => webrender_api::MixBlendMode::Multiply,
|
||||
MixBlendMode::Screen => webrender_api::MixBlendMode::Screen,
|
||||
MixBlendMode::Overlay => webrender_api::MixBlendMode::Overlay,
|
||||
MixBlendMode::Darken => webrender_api::MixBlendMode::Darken,
|
||||
MixBlendMode::Lighten => webrender_api::MixBlendMode::Lighten,
|
||||
MixBlendMode::ColorDodge => webrender_api::MixBlendMode::ColorDodge,
|
||||
MixBlendMode::ColorBurn => webrender_api::MixBlendMode::ColorBurn,
|
||||
MixBlendMode::HardLight => webrender_api::MixBlendMode::HardLight,
|
||||
MixBlendMode::SoftLight => webrender_api::MixBlendMode::SoftLight,
|
||||
MixBlendMode::Difference => webrender_api::MixBlendMode::Difference,
|
||||
MixBlendMode::Exclusion => webrender_api::MixBlendMode::Exclusion,
|
||||
MixBlendMode::Hue => webrender_api::MixBlendMode::Hue,
|
||||
MixBlendMode::Saturation => webrender_api::MixBlendMode::Saturation,
|
||||
MixBlendMode::Color => webrender_api::MixBlendMode::Color,
|
||||
MixBlendMode::Luminosity => webrender_api::MixBlendMode::Luminosity,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
trait ToImageRendering {
|
||||
fn to_image_rendering(&self) -> webrender_api::ImageRendering;
|
||||
}
|
||||
|
||||
impl ToImageRendering for ImageRendering {
|
||||
fn to_image_rendering(&self) -> webrender_api::ImageRendering {
|
||||
match *self {
|
||||
ImageRendering::CrispEdges => webrender_api::ImageRendering::CrispEdges,
|
||||
ImageRendering::Auto => webrender_api::ImageRendering::Auto,
|
||||
ImageRendering::Pixelated => webrender_api::ImageRendering::Pixelated,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
trait ToFilterOps {
|
||||
fn to_filter_ops(&self) -> Vec<webrender_api::FilterOp>;
|
||||
}
|
||||
|
||||
impl ToFilterOps for Vec<Filter> {
|
||||
fn to_filter_ops(&self) -> Vec<webrender_api::FilterOp> {
|
||||
let mut result = Vec::with_capacity(self.len());
|
||||
for filter in self.iter() {
|
||||
match *filter {
|
||||
GenericFilter::Blur(radius) => {
|
||||
result.push(webrender_api::FilterOp::Blur(radius.px()))
|
||||
},
|
||||
GenericFilter::Brightness(amount) => {
|
||||
result.push(webrender_api::FilterOp::Brightness(amount.0))
|
||||
},
|
||||
GenericFilter::Contrast(amount) => {
|
||||
result.push(webrender_api::FilterOp::Contrast(amount.0))
|
||||
},
|
||||
GenericFilter::Grayscale(amount) => {
|
||||
result.push(webrender_api::FilterOp::Grayscale(amount.0))
|
||||
},
|
||||
GenericFilter::HueRotate(angle) => {
|
||||
result.push(webrender_api::FilterOp::HueRotate(angle.radians()))
|
||||
},
|
||||
GenericFilter::Invert(amount) => {
|
||||
result.push(webrender_api::FilterOp::Invert(amount.0))
|
||||
},
|
||||
GenericFilter::Opacity(amount) => {
|
||||
result.push(webrender_api::FilterOp::Opacity(amount.0.into(), amount.0));
|
||||
},
|
||||
GenericFilter::Saturate(amount) => {
|
||||
result.push(webrender_api::FilterOp::Saturate(amount.0))
|
||||
},
|
||||
GenericFilter::Sepia(amount) => {
|
||||
result.push(webrender_api::FilterOp::Sepia(amount.0))
|
||||
},
|
||||
GenericFilter::DropShadow(ref shadow) => match *shadow {},
|
||||
}
|
||||
}
|
||||
result
|
||||
}
|
||||
}
|
||||
|
||||
pub trait ToTransformStyle {
|
||||
fn to_transform_style(&self) -> webrender_api::TransformStyle;
|
||||
}
|
||||
|
||||
impl ToTransformStyle for TransformStyle {
|
||||
fn to_transform_style(&self) -> webrender_api::TransformStyle {
|
||||
match *self {
|
||||
TransformStyle::Auto | TransformStyle::Flat => webrender_api::TransformStyle::Flat,
|
||||
TransformStyle::Preserve3d => webrender_api::TransformStyle::Preserve3D,
|
||||
top_left: self.top_left.to_layout(),
|
||||
top_right: self.top_right.to_layout(),
|
||||
bottom_left: self.bottom_left.to_layout(),
|
||||
bottom_right: self.bottom_right.to_layout(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -247,7 +64,7 @@ impl WebRenderDisplayListConverter for DisplayList {
|
|||
fn convert_to_webrender(&self, pipeline_id: PipelineId) -> DisplayListBuilder {
|
||||
let mut builder = DisplayListBuilder::with_capacity(
|
||||
pipeline_id.to_webrender(),
|
||||
self.bounds().size.to_sizef(),
|
||||
self.bounds().size.to_layout(),
|
||||
1024 * 1024,
|
||||
); // 1 MB of space
|
||||
|
||||
|
@ -277,7 +94,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
None => None,
|
||||
};
|
||||
webrender_api::LayoutPrimitiveInfo {
|
||||
rect: self.base().bounds.to_rectf(),
|
||||
rect: self.base().bounds.to_layout(),
|
||||
local_clip: self.base().local_clip,
|
||||
// TODO(gw): Make use of the WR backface visibility functionality.
|
||||
is_backface_visible: true,
|
||||
|
@ -359,34 +176,34 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
if item.stretch_size.width > Au(0) && item.stretch_size.height > Au(0) {
|
||||
builder.push_image(
|
||||
&self.prim_info(),
|
||||
item.stretch_size.to_sizef(),
|
||||
item.tile_spacing.to_sizef(),
|
||||
item.image_rendering.to_image_rendering(),
|
||||
item.stretch_size.to_layout(),
|
||||
item.tile_spacing.to_layout(),
|
||||
item.image_rendering.to_layout(),
|
||||
id,
|
||||
);
|
||||
}
|
||||
}
|
||||
},
|
||||
DisplayItem::Border(ref item) => {
|
||||
let widths = item.border_widths.to_border_widths();
|
||||
let widths = item.border_widths.to_layout();
|
||||
|
||||
let details = match item.details {
|
||||
BorderDetails::Normal(ref border) => {
|
||||
let left = webrender_api::BorderSide {
|
||||
color: border.color.left,
|
||||
style: border.style.left.to_border_style(),
|
||||
style: border.style.left.to_layout(),
|
||||
};
|
||||
let top = webrender_api::BorderSide {
|
||||
color: border.color.top,
|
||||
style: border.style.top.to_border_style(),
|
||||
style: border.style.top.to_layout(),
|
||||
};
|
||||
let right = webrender_api::BorderSide {
|
||||
color: border.color.right,
|
||||
style: border.style.right.to_border_style(),
|
||||
style: border.style.right.to_layout(),
|
||||
};
|
||||
let bottom = webrender_api::BorderSide {
|
||||
color: border.color.bottom,
|
||||
style: border.style.bottom.to_border_style(),
|
||||
style: border.style.bottom.to_layout(),
|
||||
};
|
||||
let radius = border.radius.to_border_radius();
|
||||
webrender_api::BorderDetails::Normal(webrender_api::NormalBorder {
|
||||
|
@ -422,8 +239,8 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
};
|
||||
webrender_api::BorderDetails::Gradient(webrender_api::GradientBorder {
|
||||
gradient: builder.create_gradient(
|
||||
gradient.gradient.start_point.to_pointf(),
|
||||
gradient.gradient.end_point.to_pointf(),
|
||||
gradient.gradient.start_point.to_layout(),
|
||||
gradient.gradient.end_point.to_layout(),
|
||||
gradient.gradient.stops.clone(),
|
||||
extend_mode,
|
||||
),
|
||||
|
@ -439,8 +256,8 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
webrender_api::BorderDetails::RadialGradient(
|
||||
webrender_api::RadialGradientBorder {
|
||||
gradient: builder.create_radial_gradient(
|
||||
gradient.gradient.center.to_pointf(),
|
||||
gradient.gradient.radius.to_sizef(),
|
||||
gradient.gradient.center.to_layout(),
|
||||
gradient.gradient.radius.to_layout(),
|
||||
gradient.gradient.stops.clone(),
|
||||
extend_mode,
|
||||
),
|
||||
|
@ -453,8 +270,8 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
builder.push_border(&self.prim_info(), widths, details);
|
||||
},
|
||||
DisplayItem::Gradient(ref item) => {
|
||||
let start_point = item.gradient.start_point.to_pointf();
|
||||
let end_point = item.gradient.end_point.to_pointf();
|
||||
let start_point = item.gradient.start_point.to_layout();
|
||||
let end_point = item.gradient.end_point.to_layout();
|
||||
let extend_mode = if item.gradient.repeating {
|
||||
ExtendMode::Repeat
|
||||
} else {
|
||||
|
@ -469,13 +286,13 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
builder.push_gradient(
|
||||
&self.prim_info(),
|
||||
gradient,
|
||||
item.tile.to_sizef(),
|
||||
item.tile_spacing.to_sizef(),
|
||||
item.tile.to_layout(),
|
||||
item.tile_spacing.to_layout(),
|
||||
);
|
||||
},
|
||||
DisplayItem::RadialGradient(ref item) => {
|
||||
let center = item.gradient.center.to_pointf();
|
||||
let radius = item.gradient.radius.to_sizef();
|
||||
let center = item.gradient.center.to_layout();
|
||||
let radius = item.gradient.radius.to_layout();
|
||||
let extend_mode = if item.gradient.repeating {
|
||||
ExtendMode::Repeat
|
||||
} else {
|
||||
|
@ -490,8 +307,8 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
builder.push_radial_gradient(
|
||||
&self.prim_info(),
|
||||
gradient,
|
||||
item.tile.to_sizef(),
|
||||
item.tile_spacing.to_sizef(),
|
||||
item.tile.to_layout(),
|
||||
item.tile_spacing.to_layout(),
|
||||
);
|
||||
},
|
||||
DisplayItem::Line(ref item) => {
|
||||
|
@ -505,11 +322,11 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
);
|
||||
},
|
||||
DisplayItem::BoxShadow(ref item) => {
|
||||
let box_bounds = item.box_bounds.to_rectf();
|
||||
let box_bounds = item.box_bounds.to_layout();
|
||||
builder.push_box_shadow(
|
||||
&self.prim_info(),
|
||||
box_bounds,
|
||||
item.offset.to_vectorf(),
|
||||
item.offset.to_layout(),
|
||||
item.color,
|
||||
item.blur_radius.to_f32_px(),
|
||||
item.spread_radius.to_f32_px(),
|
||||
|
@ -522,7 +339,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
&self.prim_info(),
|
||||
webrender_api::Shadow {
|
||||
blur_radius: item.blur_radius.to_f32_px(),
|
||||
offset: item.offset.to_vectorf(),
|
||||
offset: item.offset.to_layout(),
|
||||
color: item.color,
|
||||
},
|
||||
);
|
||||
|
@ -545,20 +362,24 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
.map(|perspective| LayoutTransform::from_untyped(&perspective));
|
||||
|
||||
builder.push_stacking_context(
|
||||
&webrender_api::LayoutPrimitiveInfo::new(stacking_context.bounds.to_rectf()),
|
||||
&webrender_api::LayoutPrimitiveInfo::new(stacking_context.bounds.to_layout()),
|
||||
stacking_context.scroll_policy,
|
||||
transform,
|
||||
stacking_context.transform_style,
|
||||
perspective,
|
||||
stacking_context.mix_blend_mode,
|
||||
stacking_context.filters.to_filter_ops(),
|
||||
stacking_context
|
||||
.filters
|
||||
.iter()
|
||||
.map(ToLayout::to_layout)
|
||||
.collect(),
|
||||
);
|
||||
},
|
||||
DisplayItem::PopStackingContext(_) => builder.pop_stacking_context(),
|
||||
DisplayItem::DefineClipScrollNode(ref item) => {
|
||||
let node = &clip_scroll_nodes[item.node_index.0];
|
||||
let parent_id = get_id(clip_ids, node.parent_index);
|
||||
let item_rect = node.clip.main.to_rectf();
|
||||
let item_rect = node.clip.main.to_layout();
|
||||
|
||||
let webrender_id = match node.node_type {
|
||||
ClipScrollNodeType::Clip => builder.define_clip_with_parent(
|
||||
|
@ -572,8 +393,8 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
.define_scroll_frame_with_parent(
|
||||
node.id,
|
||||
parent_id,
|
||||
node.content_rect.to_rectf(),
|
||||
node.clip.main.to_rectf(),
|
||||
node.content_rect.to_layout(),
|
||||
node.clip.main.to_layout(),
|
||||
node.clip.get_complex_clips(),
|
||||
None,
|
||||
scroll_sensitivity,
|
||||
|
@ -611,7 +432,7 @@ impl ToWebRenderClip for ClippingRegion {
|
|||
.iter()
|
||||
.map(|complex_clipping_region| {
|
||||
ComplexClipRegion::new(
|
||||
complex_clipping_region.rect.to_rectf(),
|
||||
complex_clipping_region.rect.to_layout(),
|
||||
complex_clipping_region.radii.to_border_radius(),
|
||||
ClipMode::Clip,
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue