diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-25 03:27:33 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-25 03:27:33 +0530 |
commit | 605842f193aedc1151ab38a99c49f693c76e5cf3 (patch) | |
tree | 1390698f84106f785cd82ecbbfda0bb53e725a77 /components/style/servo.rs | |
parent | 7f944afee88bb2ab13de4f37118af14d40328f7f (diff) | |
parent | e82aa66245935f0aaac61e667a38dce9b5662f42 (diff) | |
download | servo-605842f193aedc1151ab38a99c49f693c76e5cf3.tar.gz servo-605842f193aedc1151ab38a99c49f693c76e5cf3.zip |
Auto merge of #10155 - bholley:generalize_style_structs, r=SimonSapin
Generalize the style structs
This allows geckolib to pass gecko style structs and have the style system write to them directly, provided we implement all the traits.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10155)
<!-- Reviewable:end -->
Diffstat (limited to 'components/style/servo.rs')
-rw-r--r-- | components/style/servo.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/components/style/servo.rs b/components/style/servo.rs index 56aef8f6210..10867d4eaf8 100644 --- a/components/style/servo.rs +++ b/components/style/servo.rs @@ -3,13 +3,14 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use context; use data; +use properties::ComputedValues; use selector_impl::ServoSelectorImpl; use selector_matching; use stylesheets; /// Concrete types for servo Style implementation pub type Stylesheet = stylesheets::Stylesheet<ServoSelectorImpl>; -pub type PrivateStyleData = data::PrivateStyleData<ServoSelectorImpl>; +pub type PrivateStyleData = data::PrivateStyleData<ServoSelectorImpl, ComputedValues>; pub type Stylist = selector_matching::Stylist<ServoSelectorImpl>; pub type StylistWrapper = context::StylistWrapper<ServoSelectorImpl>; pub type SharedStyleContext = context::SharedStyleContext<ServoSelectorImpl>; |