mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
style: Make the author styles disabled stuff actually disable style attribute, animations, and XBL rules.
This also removes one of my FIXMEs from when I was looking at this code. We don't seem to have a pre-existing test for this feature, sigh. I'll try to write one if I have cycles for it... Note that it not applying XBL rules is a feature, given the current state of affairs. Video controls and such are right now unusable with no styles enabled. Differential Revision: https://phabricator.services.mozilla.com/D4795
This commit is contained in:
Emilio Cobos Álvarez
parent
0c0018e4d6
commit
3f08d2cc02
1 changed files with 98 additions and 100 deletions
|
|
@ -1129,8 +1129,6 @@ impl Stylist {
|
||||||
let rule_hash_target = element.rule_hash_target();
|
let rule_hash_target = element.rule_hash_target();
|
||||||
|
|
||||||
let matches_user_rules = rule_hash_target.matches_user_and_author_rules();
|
let matches_user_rules = rule_hash_target.matches_user_and_author_rules();
|
||||||
let matches_author_rules =
|
|
||||||
matches_user_rules && self.author_styles_enabled == AuthorStylesEnabled::Yes;
|
|
||||||
|
|
||||||
// Normal user-agent rules.
|
// Normal user-agent rules.
|
||||||
if let Some(map) = self.cascade_data
|
if let Some(map) = self.cascade_data
|
||||||
|
|
@ -1195,7 +1193,11 @@ impl Stylist {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut match_document_author_rules = matches_author_rules;
|
if self.author_styles_enabled == AuthorStylesEnabled::No {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut match_document_author_rules = matches_user_rules;
|
||||||
let mut shadow_cascade_order = 0;
|
let mut shadow_cascade_order = 0;
|
||||||
|
|
||||||
// XBL / Shadow DOM rules, which are author rules too.
|
// XBL / Shadow DOM rules, which are author rules too.
|
||||||
|
|
@ -1204,106 +1206,102 @@ impl Stylist {
|
||||||
// particular, normally document rules override ::slotted() rules, but
|
// particular, normally document rules override ::slotted() rules, but
|
||||||
// for !important it should be the other way around. So probably we need
|
// for !important it should be the other way around. So probably we need
|
||||||
// to add some sort of AuthorScoped cascade level or something.
|
// to add some sort of AuthorScoped cascade level or something.
|
||||||
if matches_author_rules {
|
if let Some(shadow) = rule_hash_target.shadow_root() {
|
||||||
if let Some(shadow) = rule_hash_target.shadow_root() {
|
if let Some(map) = shadow.style_data().and_then(|data| data.host_rules(pseudo_element)) {
|
||||||
if let Some(map) = shadow.style_data().and_then(|data| data.host_rules(pseudo_element)) {
|
context.with_shadow_host(Some(rule_hash_target), |context| {
|
||||||
context.with_shadow_host(Some(rule_hash_target), |context| {
|
map.get_all_matching_rules(
|
||||||
map.get_all_matching_rules(
|
element,
|
||||||
element,
|
rule_hash_target,
|
||||||
rule_hash_target,
|
applicable_declarations,
|
||||||
applicable_declarations,
|
context,
|
||||||
context,
|
flags_setter,
|
||||||
flags_setter,
|
CascadeLevel::InnerShadowNormal,
|
||||||
CascadeLevel::InnerShadowNormal,
|
shadow_cascade_order,
|
||||||
shadow_cascade_order,
|
);
|
||||||
);
|
});
|
||||||
});
|
shadow_cascade_order += 1;
|
||||||
shadow_cascade_order += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Match slotted rules in reverse order, so that the outer slotted
|
|
||||||
// rules come before the inner rules (and thus have less priority).
|
|
||||||
let mut slots = SmallVec::<[_; 3]>::new();
|
|
||||||
let mut current = rule_hash_target.assigned_slot();
|
|
||||||
while let Some(slot) = current {
|
|
||||||
slots.push(slot);
|
|
||||||
current = slot.assigned_slot();
|
|
||||||
}
|
|
||||||
|
|
||||||
for slot in slots.iter().rev() {
|
|
||||||
let shadow = slot.containing_shadow().unwrap();
|
|
||||||
if let Some(map) = shadow.style_data().and_then(|data| data.slotted_rules(pseudo_element)) {
|
|
||||||
context.with_shadow_host(Some(shadow.host()), |context| {
|
|
||||||
map.get_all_matching_rules(
|
|
||||||
element,
|
|
||||||
rule_hash_target,
|
|
||||||
applicable_declarations,
|
|
||||||
context,
|
|
||||||
flags_setter,
|
|
||||||
CascadeLevel::InnerShadowNormal,
|
|
||||||
shadow_cascade_order,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
shadow_cascade_order += 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut current_containing_shadow = rule_hash_target.containing_shadow();
|
|
||||||
while let Some(containing_shadow) = current_containing_shadow {
|
|
||||||
let cascade_data = containing_shadow.style_data();
|
|
||||||
let host = containing_shadow.host();
|
|
||||||
if let Some(map) = cascade_data.and_then(|data| data.normal_rules(pseudo_element)) {
|
|
||||||
context.with_shadow_host(Some(host), |context| {
|
|
||||||
map.get_all_matching_rules(
|
|
||||||
element,
|
|
||||||
rule_hash_target,
|
|
||||||
applicable_declarations,
|
|
||||||
context,
|
|
||||||
flags_setter,
|
|
||||||
CascadeLevel::SameTreeAuthorNormal,
|
|
||||||
shadow_cascade_order,
|
|
||||||
);
|
|
||||||
});
|
|
||||||
shadow_cascade_order += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
let host_is_svg_use_element =
|
|
||||||
host.is_svg_element() &&
|
|
||||||
host.local_name() == &*local_name!("use");
|
|
||||||
|
|
||||||
if !host_is_svg_use_element {
|
|
||||||
match_document_author_rules = false;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
debug_assert!(
|
|
||||||
cascade_data.is_none(),
|
|
||||||
"We allow no stylesheets in <svg:use> subtrees"
|
|
||||||
);
|
|
||||||
|
|
||||||
// NOTE(emilio): Hack so <svg:use> matches the rules of the
|
|
||||||
// enclosing tree.
|
|
||||||
//
|
|
||||||
// This is not a problem for invalidation and that kind of stuff
|
|
||||||
// because they still don't match rules based on elements
|
|
||||||
// outside of the shadow tree, and because the <svg:use>
|
|
||||||
// subtrees are immutable and recreated each time the source
|
|
||||||
// tree changes.
|
|
||||||
//
|
|
||||||
// We historically allow cross-document <svg:use> to have these
|
|
||||||
// rules applied, but I think that's not great. Gecko is the
|
|
||||||
// only engine supporting that.
|
|
||||||
//
|
|
||||||
// See https://github.com/w3c/svgwg/issues/504 for the relevant
|
|
||||||
// spec discussion.
|
|
||||||
current_containing_shadow = host.containing_shadow();
|
|
||||||
match_document_author_rules = current_containing_shadow.is_none();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME(emilio): This doesn't account for the author_styles_enabled
|
// Match slotted rules in reverse order, so that the outer slotted
|
||||||
// stuff...
|
// rules come before the inner rules (and thus have less priority).
|
||||||
|
let mut slots = SmallVec::<[_; 3]>::new();
|
||||||
|
let mut current = rule_hash_target.assigned_slot();
|
||||||
|
while let Some(slot) = current {
|
||||||
|
slots.push(slot);
|
||||||
|
current = slot.assigned_slot();
|
||||||
|
}
|
||||||
|
|
||||||
|
for slot in slots.iter().rev() {
|
||||||
|
let shadow = slot.containing_shadow().unwrap();
|
||||||
|
if let Some(map) = shadow.style_data().and_then(|data| data.slotted_rules(pseudo_element)) {
|
||||||
|
context.with_shadow_host(Some(shadow.host()), |context| {
|
||||||
|
map.get_all_matching_rules(
|
||||||
|
element,
|
||||||
|
rule_hash_target,
|
||||||
|
applicable_declarations,
|
||||||
|
context,
|
||||||
|
flags_setter,
|
||||||
|
CascadeLevel::InnerShadowNormal,
|
||||||
|
shadow_cascade_order,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
shadow_cascade_order += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut current_containing_shadow = rule_hash_target.containing_shadow();
|
||||||
|
while let Some(containing_shadow) = current_containing_shadow {
|
||||||
|
let cascade_data = containing_shadow.style_data();
|
||||||
|
let host = containing_shadow.host();
|
||||||
|
if let Some(map) = cascade_data.and_then(|data| data.normal_rules(pseudo_element)) {
|
||||||
|
context.with_shadow_host(Some(host), |context| {
|
||||||
|
map.get_all_matching_rules(
|
||||||
|
element,
|
||||||
|
rule_hash_target,
|
||||||
|
applicable_declarations,
|
||||||
|
context,
|
||||||
|
flags_setter,
|
||||||
|
CascadeLevel::SameTreeAuthorNormal,
|
||||||
|
shadow_cascade_order,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
shadow_cascade_order += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
let host_is_svg_use_element =
|
||||||
|
host.is_svg_element() &&
|
||||||
|
host.local_name() == &*local_name!("use");
|
||||||
|
|
||||||
|
if !host_is_svg_use_element {
|
||||||
|
match_document_author_rules = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
debug_assert!(
|
||||||
|
cascade_data.is_none(),
|
||||||
|
"We allow no stylesheets in <svg:use> subtrees"
|
||||||
|
);
|
||||||
|
|
||||||
|
// NOTE(emilio): Hack so <svg:use> matches the rules of the
|
||||||
|
// enclosing tree.
|
||||||
|
//
|
||||||
|
// This is not a problem for invalidation and that kind of stuff
|
||||||
|
// because they still don't match rules based on elements
|
||||||
|
// outside of the shadow tree, and because the <svg:use>
|
||||||
|
// subtrees are immutable and recreated each time the source
|
||||||
|
// tree changes.
|
||||||
|
//
|
||||||
|
// We historically allow cross-document <svg:use> to have these
|
||||||
|
// rules applied, but I think that's not great. Gecko is the
|
||||||
|
// only engine supporting that.
|
||||||
|
//
|
||||||
|
// See https://github.com/w3c/svgwg/issues/504 for the relevant
|
||||||
|
// spec discussion.
|
||||||
|
current_containing_shadow = host.containing_shadow();
|
||||||
|
match_document_author_rules = current_containing_shadow.is_none();
|
||||||
|
}
|
||||||
|
|
||||||
let cut_xbl_binding_inheritance =
|
let cut_xbl_binding_inheritance =
|
||||||
element.each_xbl_cascade_data(|cascade_data, quirks_mode| {
|
element.each_xbl_cascade_data(|cascade_data, quirks_mode| {
|
||||||
if let Some(map) = cascade_data.normal_rules(pseudo_element) {
|
if let Some(map) = cascade_data.normal_rules(pseudo_element) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue