diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-07-17 19:44:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 19:44:25 -0700 |
| commit | d746abaa9e69e6cf0ad187d2b46be661bbe03a9f (patch) | |
| tree | 88e530de84083ce9251fd2ba3b00d914ec3beb76 /components/style/traversal.rs | |
| parent | 97023f18f34413d79b0c7e0b7d5cb3781868392f (diff) | |
| parent | 8eafe6a3b7a5a4170857a968176b643a22d2ff48 (diff) | |
| download | servo-d746abaa9e69e6cf0ad187d2b46be661bbe03a9f.tar.gz servo-d746abaa9e69e6cf0ad187d2b46be661bbe03a9f.zip | |
Auto merge of #17767 - Manishearth:stylo-fuse, r=bholley
stylo: Fuse ServoStyleContext and ServoComputedValues
r=bholley https://bugzilla.mozilla.org/show_bug.cgi?id=1367904
<!-- 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/17767)
<!-- Reviewable:end -->
Diffstat (limited to 'components/style/traversal.rs')
| -rw-r--r-- | components/style/traversal.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/style/traversal.rs b/components/style/traversal.rs index 485024627a0..b9475ce7565 100644 --- a/components/style/traversal.rs +++ b/components/style/traversal.rs @@ -485,7 +485,7 @@ where StyleResolverForElement::new(*ancestor, context, rule_inclusion) .resolve_primary_style( style.as_ref().map(|s| &**s), - layout_parent_style.as_ref().map(|s| &**s) + layout_parent_style.as_ref().map(|s| &***s) ); let is_display_contents = primary_style.style.is_display_contents(); @@ -502,7 +502,7 @@ where StyleResolverForElement::new(element, context, rule_inclusion) .resolve_style( style.as_ref().map(|s| &**s), - layout_parent_style.as_ref().map(|s| &**s) + layout_parent_style.as_ref().map(|s| &***s) ) } |