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/selector_parser.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/selector_parser.rs')
| -rw-r--r-- | components/style/selector_parser.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/style/selector_parser.rs b/components/style/selector_parser.rs index 1dbc96d3db2..3f5a43365cf 100644 --- a/components/style/selector_parser.rs +++ b/components/style/selector_parser.rs @@ -38,7 +38,7 @@ pub use gecko::restyle_damage::GeckoRestyleDamage as RestyleDamage; /// A type that represents the previous computed values needed for restyle /// damage calculation. #[cfg(feature = "servo")] -pub type PreExistingComputedValues = ::properties::ServoComputedValues; +pub type PreExistingComputedValues = ::properties::ComputedValues; /// A type that represents the previous computed values needed for restyle /// damage calculation. |