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

Check ElementHasAnimations before trying to get animations rules.

Browse source 
In case of ::before and ::after element, the generated content has no
ElementHasAnimations flag, their parent has the flag.
This commit is contained in:
Hiroyuki Ikezoe 2017-05-24 11:12:09 +09:00
parent 4935d972e5
commit fce7c2d885
3 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/style/matching.rs
View file

@ -254,12 +254,15 @@ trait PrivateMatchMethods: TElement {
// We could make that a bit better if the complexity cost is not too
// big, but given further restyles are posted directly to
// pseudo-elements, it doesn't seem worth the effort at a glance.
if pseudo.is_eager() && primary_style.rules.get_animation_rules().is_empty() {
if pseudo.is_eager() {
let parent = self.parent_element().unwrap();
let parent_data = parent.borrow_data().unwrap();
let pseudo_style =
parent_data.styles().pseudos.get(&pseudo).unwrap();
return pseudo_style.values().clone()
if !parent.may_have_animations() ||
primary_style.rules.get_animation_rules().is_empty() {
let parent_data = parent.borrow_data().unwrap();
let pseudo_style =
parent_data.styles().pseudos.get(&pseudo).unwrap();
return pseudo_style.values().clone()
}
}
}
@ -692,7 +695,7 @@ pub trait MatchMethods : TElement {
let pseudo_style =
parent_data.styles().pseudos.get(&pseudo).unwrap();
let mut rules = pseudo_style.rules.clone();
{
if parent.may_have_animations() {
let animation_rules = data.get_animation_rules();
// Handle animations here.
@ -739,7 +742,11 @@ pub trait MatchMethods : TElement {
let style_attribute = self.style_attribute();
{
let smil_override = data.get_smil_override();
let animation_rules = data.get_animation_rules();
let animation_rules = if self.may_have_animations() {
data.get_animation_rules()
} else {
AnimationRules(None, None)
};
let bloom = context.thread_local.bloom_filter.filter();
let map = &mut context.thread_local.selector_flags;