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: Refactor TRestyleDamage and TNode to accept/provide a "style source"

Browse source 
In the Gecko case, this style source would be the style context. In the servo
case, it will be always the computed values.

We could optimise this further in the case of stylo (from three FFI calls to
one) if we use an API of the form CalcAndStore(node, new_cv). But that would
imply borrowing the data twice from Servo (we also have borrow_data_unchecked
fwiw, but...).
This commit is contained in:
Emilio Cobos Álvarez 2016-07-29 14:17:56 -07:00
parent 1470d5b174
commit 6d67525172
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
10 changed files with 120 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

37
components/style/matching.rs
View file

@ -6,7 +6,7 @@
#![allow(unsafe_code)]
use animation::{self, Animation};
use animation;
use arc_ptr_eq;
use cache::{LRUCache, SimpleHashCache};
use context::{StyleContext, SharedStyleContext};
@ -442,8 +442,13 @@ trait PrivateMatchMethods: TNode
cacheable = cacheable && !animations_started
}
let existing_style =
self.existing_style_for_restyle_damage(style.map(|s| &*s));
// Calculate style difference.
let damage = Self::ConcreteRestyleDamage::compute(style.map(|s| &*s), &this_style);
let damage =
Self::ConcreteRestyleDamage::compute(existing_style, &this_style);
// Cache the resolved style if it was cacheable.
if cacheable {
@ -490,8 +495,9 @@ trait PrivateMatchMethods: TNode
// See #12171 and the associated PR for an example where this
// happened while debugging other release panic.
if !running_animation.is_expired() {
animation::update_style_for_animation::<Self::ConcreteRestyleDamage>(
context, running_animation, style, None);
animation::update_style_for_animation(context,
running_animation,
style);
running_animation.mark_as_expired();
}
}
@ -585,9 +591,17 @@ pub trait ElementMatchMethods : TElement {
if let Some(shared_style) = self.share_style_with_candidate_if_possible(parent.clone(), candidate) {
// Yay, cache hit. Share the style.
let node = self.as_node();
let style = &mut node.mutate_data().unwrap().style;
let damage = <<Self as TElement>::ConcreteNode as TNode>
::ConcreteRestyleDamage::compute((*style).as_ref(), &shared_style);
let damage = {
let source =
node.existing_style_for_restyle_damage((*style).as_ref());
let damage = <<Self as TElement>::ConcreteNode as TNode>
::ConcreteRestyleDamage::compute(source, &shared_style);
damage
};
*style = Some(shared_style);
return StyleSharingResult::StyleWasShared(i, damage)
}
@ -675,8 +689,14 @@ pub trait MatchMethods : TNode {
let mut data_ref = self.mutate_data().unwrap();
let mut data = &mut *data_ref;
let cloned_parent_style = ComputedValues::style_for_child_text_node(parent_style.unwrap());
damage = Self::ConcreteRestyleDamage::compute(data.style.as_ref(),
&cloned_parent_style);
{
let existing_style =
self.existing_style_for_restyle_damage(data.style.as_ref());
damage = Self::ConcreteRestyleDamage::compute(existing_style,
&cloned_parent_style);
}
data.style = Some(cloned_parent_style);
} else {
damage = {
@ -697,7 +717,6 @@ pub trait MatchMethods : TNode {
let applicable_declarations_for_this_pseudo =
applicable_declarations.per_pseudo.get(&pseudo).unwrap();
if !applicable_declarations_for_this_pseudo.is_empty() {
// NB: Transitions and animations should only work for
// pseudo-elements ::before and ::after