mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Auto merge of #24426 - servo:wrup, r=jdm,nox
Update webrender <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24426) <!-- Reviewable:end -->
This commit is contained in:
bors-servo
GitHub
commit
7da8d75a7e
19 changed files with 124 additions and 89 deletions
|
|
@ -67,7 +67,7 @@ use style::values::generics::image::{GradientKind, PaintWorklet};
|
|||
use style::values::specified::ui::CursorKind;
|
||||
use style::values::RGBA;
|
||||
use style_traits::ToCss;
|
||||
use webrender_api::units::{LayoutRect, LayoutSize, LayoutTransform, LayoutVector2D};
|
||||
use webrender_api::units::{LayoutRect, LayoutTransform, LayoutVector2D};
|
||||
use webrender_api::{self, BorderDetails, BorderRadius, BorderSide, BoxShadowClipMode, ColorF};
|
||||
use webrender_api::{ColorU, ExternalScrollId, FilterOp, GlyphInstance, ImageRendering, LineStyle};
|
||||
use webrender_api::{NinePatchBorder, NinePatchBorderSource, NormalBorder};
|
||||
|
|
@ -357,9 +357,6 @@ impl<'a> DisplayListBuildState<'a> {
|
|||
}
|
||||
|
||||
fn add_image_item(&mut self, base: BaseDisplayItem, item: webrender_api::ImageDisplayItem) {
|
||||
if item.stretch_size == LayoutSize::zero() {
|
||||
return;
|
||||
}
|
||||
self.add_display_item(DisplayItem::Image(CommonDisplayItem::new(base, item)))
|
||||
}
|
||||
|
||||
|
|
@ -833,6 +830,10 @@ impl Fragment {
|
|||
index,
|
||||
);
|
||||
|
||||
if placement.tile_size.is_empty_or_negative() {
|
||||
return;
|
||||
}
|
||||
|
||||
state.clipping_and_scrolling_scope(|state| {
|
||||
if !placement.clip_radii.is_zero() {
|
||||
let clip_id =
|
||||
|
|
@ -849,9 +850,9 @@ impl Fragment {
|
|||
);
|
||||
|
||||
debug!("(building display list) adding background image.");
|
||||
state.add_image_item(
|
||||
let item = CommonDisplayItem::new(
|
||||
base,
|
||||
webrender_api::ImageDisplayItem {
|
||||
webrender_api::RepeatingImageDisplayItem {
|
||||
bounds: placement.bounds.to_f32_px(),
|
||||
common: items::empty_common_item_properties(),
|
||||
image_key: webrender_image.key.unwrap(),
|
||||
|
|
@ -862,6 +863,7 @@ impl Fragment {
|
|||
color: webrender_api::ColorF::WHITE,
|
||||
},
|
||||
);
|
||||
state.add_display_item(DisplayItem::RepeatingImage(item))
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -1835,8 +1837,6 @@ impl Fragment {
|
|||
bounds: stacking_relative_content_box.to_layout(),
|
||||
common: items::empty_common_item_properties(),
|
||||
image_key: id,
|
||||
stretch_size: stacking_relative_content_box.size.to_layout(),
|
||||
tile_spacing: LayoutSize::zero(),
|
||||
image_rendering: self
|
||||
.style
|
||||
.get_inherited_box()
|
||||
|
|
@ -1858,8 +1858,6 @@ impl Fragment {
|
|||
bounds: stacking_relative_content_box.to_layout(),
|
||||
common: items::empty_common_item_properties(),
|
||||
image_key: *image_key,
|
||||
stretch_size: stacking_relative_border_box.size.to_layout(),
|
||||
tile_spacing: LayoutSize::zero(),
|
||||
image_rendering: ImageRendering::Auto,
|
||||
alpha_type: webrender_api::AlphaType::PremultipliedAlpha,
|
||||
color: webrender_api::ColorF::WHITE,
|
||||
|
|
@ -1891,8 +1889,6 @@ impl Fragment {
|
|||
bounds: stacking_relative_border_box.to_layout(),
|
||||
common: items::empty_common_item_properties(),
|
||||
image_key,
|
||||
stretch_size: stacking_relative_content_box.size.to_layout(),
|
||||
tile_spacing: LayoutSize::zero(),
|
||||
image_rendering: ImageRendering::Auto,
|
||||
alpha_type: webrender_api::AlphaType::PremultipliedAlpha,
|
||||
color: webrender_api::ColorF::WHITE,
|
||||
|
|
|
|||
|
|
@ -25,10 +25,11 @@ use std::fmt;
|
|||
use style::computed_values::_servo_top_layer::T as InTopLayer;
|
||||
use webrender_api as wr;
|
||||
use webrender_api::units::{LayoutPixel, LayoutPoint, LayoutRect, LayoutSize, LayoutTransform};
|
||||
use webrender_api::{BorderRadius, ClipId, ClipMode, CommonItemProperties, ComplexClipRegion};
|
||||
use webrender_api::{ExternalScrollId, FilterOp, GlyphInstance, GradientStop, ImageKey};
|
||||
use webrender_api::{MixBlendMode, ScrollSensitivity, Shadow, SpatialId};
|
||||
use webrender_api::{StickyOffsetBounds, TransformStyle};
|
||||
use webrender_api::{
|
||||
BorderRadius, ClipId, ClipMode, CommonItemProperties, ComplexClipRegion, ExternalScrollId,
|
||||
FilterOp, GlyphInstance, GradientStop, ImageKey, MixBlendMode, PrimitiveFlags,
|
||||
ScrollSensitivity, Shadow, SpatialId, StickyOffsetBounds, TransformStyle,
|
||||
};
|
||||
|
||||
pub use style::dom::OpaqueNode;
|
||||
|
||||
|
|
@ -377,6 +378,7 @@ pub enum DisplayItem {
|
|||
Rectangle(Box<CommonDisplayItem<wr::RectangleDisplayItem>>),
|
||||
Text(Box<CommonDisplayItem<wr::TextDisplayItem, Vec<GlyphInstance>>>),
|
||||
Image(Box<CommonDisplayItem<wr::ImageDisplayItem>>),
|
||||
RepeatingImage(Box<CommonDisplayItem<wr::RepeatingImageDisplayItem>>),
|
||||
Border(Box<CommonDisplayItem<wr::BorderDisplayItem, Vec<GradientStop>>>),
|
||||
Gradient(Box<CommonDisplayItem<wr::GradientDisplayItem, Vec<GradientStop>>>),
|
||||
RadialGradient(Box<CommonDisplayItem<wr::RadialGradientDisplayItem, Vec<GradientStop>>>),
|
||||
|
|
@ -451,7 +453,7 @@ pub fn empty_common_item_properties() -> CommonItemProperties {
|
|||
clip_id: ClipId::root(wr::PipelineId::dummy()),
|
||||
spatial_id: SpatialId::root_scroll_node(wr::PipelineId::dummy()),
|
||||
hit_info: None,
|
||||
is_backface_visible: false,
|
||||
flags: PrimitiveFlags::empty(),
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -672,6 +674,7 @@ impl DisplayItem {
|
|||
DisplayItem::Rectangle(ref rect) => &rect.base,
|
||||
DisplayItem::Text(ref text) => &text.base,
|
||||
DisplayItem::Image(ref image_item) => &image_item.base,
|
||||
DisplayItem::RepeatingImage(ref image_item) => &image_item.base,
|
||||
DisplayItem::Border(ref border) => &border.base,
|
||||
DisplayItem::Gradient(ref gradient) => &gradient.base,
|
||||
DisplayItem::RadialGradient(ref gradient) => &gradient.base,
|
||||
|
|
@ -703,6 +706,7 @@ impl DisplayItem {
|
|||
DisplayItem::Rectangle(ref item) => item.item.common.clip_rect,
|
||||
DisplayItem::Text(ref item) => item.item.bounds,
|
||||
DisplayItem::Image(ref item) => item.item.bounds,
|
||||
DisplayItem::RepeatingImage(ref item) => item.item.bounds,
|
||||
DisplayItem::Border(ref item) => item.item.bounds,
|
||||
DisplayItem::Gradient(ref item) => item.item.bounds,
|
||||
DisplayItem::RadialGradient(ref item) => item.item.bounds,
|
||||
|
|
@ -736,20 +740,21 @@ impl fmt::Debug for DisplayItem {
|
|||
f,
|
||||
"{} @ {:?} {:?}",
|
||||
match *self {
|
||||
DisplayItem::Rectangle(_) => "Rectangle".to_owned(),
|
||||
DisplayItem::Text(_) => "Text".to_owned(),
|
||||
DisplayItem::Image(_) => "Image".to_owned(),
|
||||
DisplayItem::Border(_) => "Border".to_owned(),
|
||||
DisplayItem::Gradient(_) => "Gradient".to_owned(),
|
||||
DisplayItem::RadialGradient(_) => "RadialGradient".to_owned(),
|
||||
DisplayItem::Line(_) => "Line".to_owned(),
|
||||
DisplayItem::BoxShadow(_) => "BoxShadow".to_owned(),
|
||||
DisplayItem::PushTextShadow(_) => "PushTextShadow".to_owned(),
|
||||
DisplayItem::PopAllTextShadows(_) => "PopTextShadow".to_owned(),
|
||||
DisplayItem::Iframe(_) => "Iframe".to_owned(),
|
||||
DisplayItem::Rectangle(_) => "Rectangle",
|
||||
DisplayItem::Text(_) => "Text",
|
||||
DisplayItem::Image(_) => "Image",
|
||||
DisplayItem::RepeatingImage(_) => "RepeatingImage",
|
||||
DisplayItem::Border(_) => "Border",
|
||||
DisplayItem::Gradient(_) => "Gradient",
|
||||
DisplayItem::RadialGradient(_) => "RadialGradient",
|
||||
DisplayItem::Line(_) => "Line",
|
||||
DisplayItem::BoxShadow(_) => "BoxShadow",
|
||||
DisplayItem::PushTextShadow(_) => "PushTextShadow",
|
||||
DisplayItem::PopAllTextShadows(_) => "PopTextShadow",
|
||||
DisplayItem::Iframe(_) => "Iframe",
|
||||
DisplayItem::PushStackingContext(_) |
|
||||
DisplayItem::PopStackingContext(_) |
|
||||
DisplayItem::DefineClipScrollNode(_) => "".to_owned(),
|
||||
DisplayItem::DefineClipScrollNode(_) => "",
|
||||
},
|
||||
self.bounds(),
|
||||
self.base().clip_rect
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ use crate::display_list::items::{BaseDisplayItem, ClipScrollNode, ClipScrollNode
|
|||
use crate::display_list::items::{DisplayItem, DisplayList, StackingContextType};
|
||||
use msg::constellation_msg::PipelineId;
|
||||
use webrender_api::units::LayoutPoint;
|
||||
use webrender_api::{self, ClipId, CommonItemProperties, DisplayItem as WrDisplayItem};
|
||||
use webrender_api::{DisplayListBuilder, PropertyBinding, PushStackingContextDisplayItem};
|
||||
use webrender_api::{
|
||||
RasterSpace, ReferenceFrameKind, SpaceAndClipInfo, SpatialId, StackingContext,
|
||||
self, ClipId, CommonItemProperties, DisplayItem as WrDisplayItem, DisplayListBuilder,
|
||||
PrimitiveFlags, PropertyBinding, PushStackingContextDisplayItem, RasterSpace,
|
||||
ReferenceFrameKind, SpaceAndClipInfo, SpatialId, StackingContext,
|
||||
};
|
||||
|
||||
struct ClipScrollState {
|
||||
|
|
@ -121,6 +121,11 @@ impl DisplayItem {
|
|||
builder.push_item(&WrDisplayItem::Image(item.item));
|
||||
IsContentful(true)
|
||||
},
|
||||
DisplayItem::RepeatingImage(ref mut item) => {
|
||||
item.item.common = build_common_item_properties(&item.base, state);
|
||||
builder.push_item(&WrDisplayItem::RepeatingImage(item.item));
|
||||
IsContentful(true)
|
||||
},
|
||||
DisplayItem::Border(ref mut item) => {
|
||||
item.item.common = build_common_item_properties(&item.base, state);
|
||||
if !item.data.is_empty() {
|
||||
|
|
@ -232,7 +237,7 @@ impl DisplayItem {
|
|||
let wr_item = PushStackingContextDisplayItem {
|
||||
origin: bounds.origin,
|
||||
spatial_id,
|
||||
is_backface_visible: true,
|
||||
prim_flags: PrimitiveFlags::default(),
|
||||
stacking_context: StackingContext {
|
||||
transform_style: stacking_context.transform_style,
|
||||
mix_blend_mode: stacking_context.mix_blend_mode,
|
||||
|
|
@ -331,7 +336,7 @@ fn build_common_item_properties(
|
|||
spatial_id: state.active_spatial_id,
|
||||
clip_id: state.active_clip_id,
|
||||
// TODO(gw): Make use of the WR backface visibility functionality.
|
||||
is_backface_visible: true,
|
||||
flags: PrimitiveFlags::default(),
|
||||
hit_info: tag,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue