mirror of
https://github.com/servo/servo.git
synced 2025-08-02 04:00:32 +01:00
Update webrender to 923ee495bd9b0fda8a4a94c5a6cf42e2f0548731.
This commit is contained in:
parent
d13172845c
commit
171469c27c
14 changed files with 128 additions and 120 deletions
|
@ -36,8 +36,8 @@ use style::values::generics::image::EndingShape as GenericEndingShape;
|
|||
use style::values::generics::image::GradientItem as GenericGradientItem;
|
||||
use style::values::specified::background::BackgroundRepeatKeyword;
|
||||
use style::values::specified::position::{X, Y};
|
||||
use webrender_api::{BorderRadius, BorderSide, BorderStyle, BorderWidths, ColorF};
|
||||
use webrender_api::{ExtendMode, Gradient, GradientStop, LayoutSize};
|
||||
use webrender_api::{BorderRadius, BorderSide, BorderStyle, ColorF};
|
||||
use webrender_api::{ExtendMode, Gradient, GradientStop, LayoutSize, LayoutSideOffsets};
|
||||
use webrender_api::{NormalBorder, RadialGradient};
|
||||
|
||||
/// A helper data structure for gradients.
|
||||
|
@ -771,6 +771,7 @@ pub fn simple_normal_border(color: ColorF, style: BorderStyle) -> NormalBorder {
|
|||
top: side,
|
||||
bottom: side,
|
||||
radius: BorderRadius::zero(),
|
||||
do_aa: true,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -834,13 +835,13 @@ fn calculate_border_image_width_side(
|
|||
|
||||
pub fn calculate_border_image_width(
|
||||
width: &BorderImageWidth,
|
||||
border: BorderWidths,
|
||||
border: LayoutSideOffsets,
|
||||
border_area: Size2D<Au>,
|
||||
) -> BorderWidths {
|
||||
BorderWidths {
|
||||
left: calculate_border_image_width_side(width.3, border.left, border_area.width),
|
||||
top: calculate_border_image_width_side(width.0, border.top, border_area.height),
|
||||
right: calculate_border_image_width_side(width.1, border.right, border_area.width),
|
||||
bottom: calculate_border_image_width_side(width.2, border.bottom, border_area.height),
|
||||
}
|
||||
) -> LayoutSideOffsets {
|
||||
LayoutSideOffsets::new(
|
||||
calculate_border_image_width_side(width.0, border.top, border_area.height),
|
||||
calculate_border_image_width_side(width.1, border.right, border_area.width),
|
||||
calculate_border_image_width_side(width.2, border.bottom, border_area.height),
|
||||
calculate_border_image_width_side(width.3, border.left, border_area.width),
|
||||
)
|
||||
}
|
||||
|
|
|
@ -1367,6 +1367,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||
style: border_style.bottom.to_layout(),
|
||||
},
|
||||
radius: border_radius,
|
||||
do_aa: true,
|
||||
});
|
||||
state.add_display_item(DisplayItem::Border(CommonDisplayItem::with_data(
|
||||
base,
|
||||
|
|
|
@ -129,14 +129,14 @@ impl ToLayout for Rect<Au> {
|
|||
}
|
||||
|
||||
impl ToLayout for SideOffsets2D<Au> {
|
||||
type Type = wr::BorderWidths;
|
||||
type Type = wr::LayoutSideOffsets;
|
||||
fn to_layout(&self) -> Self::Type {
|
||||
wr::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(),
|
||||
}
|
||||
wr::LayoutSideOffsets::new(
|
||||
self.top.to_f32_px(),
|
||||
self.right.to_f32_px(),
|
||||
self.bottom.to_f32_px(),
|
||||
self.left.to_f32_px(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
use display_list::items::{ClipScrollNode, ClipScrollNodeIndex, ClipScrollNodeType};
|
||||
use display_list::items::{DisplayItem, DisplayList, StackingContextType};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use webrender_api::{self, ClipAndScrollInfo, ClipId, DisplayListBuilder, GlyphRasterSpace};
|
||||
use webrender_api::{self, ClipAndScrollInfo, ClipId, DisplayListBuilder, RasterSpace};
|
||||
use webrender_api::LayoutPoint;
|
||||
|
||||
pub trait WebRenderDisplayListConverter {
|
||||
|
@ -253,7 +253,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
|
|||
stacking_context.transform_style,
|
||||
stacking_context.mix_blend_mode,
|
||||
stacking_context.filters.clone(),
|
||||
GlyphRasterSpace::Screen,
|
||||
RasterSpace::Screen,
|
||||
);
|
||||
|
||||
if stacking_context.established_reference_frame.is_some() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue