Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Special-case pseudo style attributes to avoid ignoring doc colors.

Browse source 
That way color pickers work even when this setting is on. We always know that
pseudo-element style attributes are trusted.

Bug: 1429248
Reviewed-by: heycam
MozReview-Commit-ID: 6IdmRaMzj6I
This commit is contained in:
Emilio Cobos Álvarez 2018-01-10 00:45:23 +01:00
parent 7bdeeaa702
commit e858dc060e
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 35 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

42
components/style/properties/properties.mako.rs
View file

@ -680,7 +680,36 @@ impl LonghandId {
/// Returns true if the property is one that is ignored when document /// Returns true if the property is one that is ignored when document
/// colors are disabled. /// colors are disabled.
fn is_ignored_when_document_colors_disabled(&self) -> bool { fn is_ignored_when_document_colors_disabled(
&self,
cascade_level: CascadeLevel,
pseudo: Option<<&PseudoElement>,
) -> bool {
let is_ua_or_user_rule = matches!(
cascade_level,
CascadeLevel::UANormal |
CascadeLevel::UserNormal |
CascadeLevel::UserImportant |
CascadeLevel::UAImportant
);
if is_ua_or_user_rule {
return false;
}
let is_style_attribute = matches!(
cascade_level,
CascadeLevel::StyleAttributeNormal |
CascadeLevel::StyleAttributeImportant
);
// Don't override colors on pseudo-element's style attributes. The
// background-color on ::-moz-color-swatch is an example. Those are set
// as an author style (via the style attribute), but it's pretty
// important for it to show up for obvious reasons :)
if pseudo.is_some() && is_style_attribute {
return false;
}
matches!(*self, matches!(*self,
${" | ".join([("LonghandId::" + p.camel_case) ${" | ".join([("LonghandId::" + p.camel_case)
for p in data.longhands if p.ignored_when_colors_disabled])} for p in data.longhands if p.ignored_when_colors_disabled])}
@ -3383,12 +3412,11 @@ where
// marked as ignored in that mode, unless they come from a UA or // marked as ignored in that mode, unless they come from a UA or
// user style sheet. // user style sheet.
if ignore_colors && if ignore_colors &&
longhand_id.is_ignored_when_document_colors_disabled() && longhand_id.is_ignored_when_document_colors_disabled(
!matches!(cascade_level, cascade_level,
CascadeLevel::UANormal | context.builder.pseudo
CascadeLevel::UserNormal | )
CascadeLevel::UserImportant | {
CascadeLevel::UAImportant) {
let non_transparent_background = match *declaration { let non_transparent_background = match *declaration {
PropertyDeclaration::BackgroundColor(ref color) => { PropertyDeclaration::BackgroundColor(ref color) => {
// Treat background-color a bit differently. If the specified // Treat background-color a bit differently. If the specified