Skip to content
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/css/properties/border.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,10 @@ mod border_handler_body {
self.flush(dest, context);
self.flush_unparsed(val, dest, context);
Comment thread
robobun marked this conversation as resolved.
Resolved
} else {
if self.border_image_handler.will_flush(property) {
if self
.border_image_handler
.will_flush(property, &context.targets)
{
self.flush(dest, context);
}
return self
Expand All @@ -1442,7 +1445,10 @@ mod border_handler_body {
}
}
_ => {
if self.border_image_handler.will_flush(property) {
if self
.border_image_handler
.will_flush(property, &context.targets)
{
self.flush(dest, context);
}
return self
Expand Down
48 changes: 37 additions & 11 deletions src/css/properties/border_image.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,16 @@ pub(crate) struct BorderImageHandler {
pub has_any: bool,
}

macro_rules! keeps_fallback {
($buffered:expr, $new:expr, $targets:expr) => {
matches!(
(&$buffered, $targets.browsers),
(Some(buffered), Some(browsers))
if !buffered.eql($new) && !$new.is_compatible(&browsers)
)
};
}
Comment thread
robobun marked this conversation as resolved.
Resolved

impl BorderImageHandler {
pub(crate) fn handle_property(
&mut self,
Expand All @@ -485,11 +495,7 @@ impl BorderImageHandler {
// per-field name dispatch without reflection.
macro_rules! flush_helper {
($self:expr, $d:expr, $ctx:expr, $name:ident, $val:expr) => {
if $self.$name.is_some()
&& !$self.$name.as_ref().unwrap().eql($val)
&& $ctx.targets.browsers.is_some()
&& $val.is_compatible(&$ctx.targets.browsers.unwrap())
{
if keeps_fallback!($self.$name, $val, $ctx.targets) {
$self.flush($d, $ctx);
}
Comment thread
robobun marked this conversation as resolved.
Resolved
};
Expand Down Expand Up @@ -583,13 +589,33 @@ impl BorderImageHandler {
self.repeat = None;
}
Comment thread
robobun marked this conversation as resolved.
Resolved

pub(crate) fn will_flush(&self, property: &Property) -> bool {
/// Matches each flush in `handle_property`, so `BorderHandler` can write its `border` first.
pub(crate) fn will_flush(&self, property: &Property, targets: &css::targets::Targets) -> bool {
let prefixed = self.vendor_prefix != VendorPrefix::NONE;
match property {
Property::BorderImageSource(_)
| Property::BorderImageSlice(_)
| Property::BorderImageWidth(_)
| Property::BorderImageOutset(_)
| Property::BorderImageRepeat(_) => self.vendor_prefix != VendorPrefix::NONE,
Property::BorderImageSource(val) => {
prefixed || keeps_fallback!(self.source, val, targets)
}
Property::BorderImageSlice(val) => {
prefixed || keeps_fallback!(self.slice, val, targets)
}
Property::BorderImageWidth(val) => {
prefixed || keeps_fallback!(self.width, val, targets)
}
Property::BorderImageOutset(val) => {
prefixed || keeps_fallback!(self.outset, val, targets)
}
Property::BorderImageRepeat(val) => {
prefixed || keeps_fallback!(self.repeat, val, targets)
}
Property::BorderImage(val) => {
let val = &val.0;
keeps_fallback!(self.source, &val.source, targets)
|| keeps_fallback!(self.slice, &val.slice, targets)
|| keeps_fallback!(self.width, &val.width, targets)
|| keeps_fallback!(self.outset, &val.outset, targets)
|| keeps_fallback!(self.repeat, &val.repeat, targets)
}
Property::Unparsed(val) => is_border_image_property(val.property_id.tag()),
_ => false,
}
Expand Down
Loading
Loading