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

style: pass a borrow instead of an Arc

Browse source 
https://bugzilla.mozilla.org/show_bug.cgi?id=1380133 has landed,
permitting us to pass a plain borrow into Gecko_CalcStyleDifference;
propagate this through style.

Closes #17795.
This commit is contained in:
Tamir Duberstein 2017-08-18 20:21:17 -07:00
parent 9f64630eaa
commit c348d5afb3
No known key found for this signature in database
GPG key ID: 1C1E98CC8E17BB89
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/style/matching.rs
View file

@ -341,7 +341,7 @@ trait PrivateMatchMethods: TElement {
shared_context: &SharedStyleContext,
restyle: &mut RestyleData,
old_values: &ComputedValues,
new_values: &Arc<ComputedValues>,
new_values: &ComputedValues,
pseudo: Option<&PseudoElement>)
-> ChildCascadeRequirement {
// Don't accumulate damage if we're in a forgetful traversal.
@ -360,7 +360,7 @@ trait PrivateMatchMethods: TElement {
restyle.reconstructed_self_or_ancestor();
let difference =
self.compute_style_difference(&old_values, &new_values, pseudo);
self.compute_style_difference(old_values, new_values, pseudo);
if !skip_applying_damage {
restyle.damage |= difference.damage;
@ -389,10 +389,10 @@ trait PrivateMatchMethods: TElement {
_shared_context: &SharedStyleContext,
restyle: &mut RestyleData,
old_values: &ComputedValues,
new_values: &Arc<ComputedValues>,
new_values: &ComputedValues,
pseudo: Option<&PseudoElement>)
-> ChildCascadeRequirement {
let difference = self.compute_style_difference(&old_values, &new_values, pseudo);
let difference = self.compute_style_difference(old_values, new_values, pseudo);
restyle.damage |= difference.damage;
match difference.change {
StyleChange::Changed => ChildCascadeRequirement::MustCascadeChildren,
@ -657,7 +657,7 @@ pub trait MatchMethods : TElement {
shared_context: &SharedStyleContext,
restyle: &mut RestyleData,
old_values: Option<&ComputedValues>,
new_values: &Arc<ComputedValues>,
new_values: &ComputedValues,
pseudo: Option<&PseudoElement>)
-> ChildCascadeRequirement {
let old_values = match old_values {
@ -817,7 +817,7 @@ pub trait MatchMethods : TElement {
fn compute_style_difference(
&self,
old_values: &ComputedValues,
new_values: &Arc<ComputedValues>,
new_values: &ComputedValues,
pseudo: Option<&PseudoElement>
) -> StyleDifference {
debug_assert!(pseudo.map_or(true, |p| p.is_eager()));