diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-07-20 20:28:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 20:28:25 -0700 |
| commit | a3c398b5dacae251f483775042b12ffb5e0ff01c (patch) | |
| tree | bb27eb0d3b6d2cceccd6308921700551167eedc9 /components/style/servo | |
| parent | fafb8476e87af305d375a27fd0d8cf7e10c9d2d5 (diff) | |
| parent | ef4fbfaa6b1ca0a2454cdfab5004e252fd55ece4 (diff) | |
| download | servo-a3c398b5dacae251f483775042b12ffb5e0ff01c.tar.gz servo-a3c398b5dacae251f483775042b12ffb5e0ff01c.zip | |
Auto merge of #17802 - emilio:reland-stuff, r=heycam
Revert "Backed out changeset b10e6ba9cbdb because gecko part had to b…
…e backed out."
This reverts commit b96d96d448c8ff93f212f225013461999540a5d0.
The fix on the Gecko side is trivial, and I can land it after this lands.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17802)
<!-- Reviewable:end -->
Diffstat (limited to 'components/style/servo')
| -rw-r--r-- | components/style/servo/restyle_damage.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/style/servo/restyle_damage.rs b/components/style/servo/restyle_damage.rs index f99e6120bb9..f85e8b6b13c 100644 --- a/components/style/servo/restyle_damage.rs +++ b/components/style/servo/restyle_damage.rs @@ -60,7 +60,8 @@ impl HeapSizeOf for ServoRestyleDamage { impl ServoRestyleDamage { /// Compute the `StyleDifference` (including the appropriate restyle damage) /// for a given style change between `old` and `new`. - pub fn compute_style_difference(old: &ComputedValues, + pub fn compute_style_difference(_source: &ComputedValues, + old: &ComputedValues, new: &ComputedValues) -> StyleDifference { let damage = compute_damage(old, new); |