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/traversal.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/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 79759cf26b9..f39347e83ab 100644 --- a/components/style/traversal.rs +++ b/components/style/traversal.rs @@ -123,7 +123,7 @@ pub fn recalc_style_at<'a, N, C>(context: &'a C, root: OpaqueNode, node: N) where N: TNode, - C: StyleContext<'a, <N::ConcreteElement as Element>::Impl>, + C: StyleContext<'a, <N::ConcreteElement as Element>::Impl, N::ConcreteComputedValues>, <N::ConcreteElement as Element>::Impl: SelectorImplExt + 'a { // Initialize layout data. // @@ -195,7 +195,7 @@ pub fn recalc_style_at<'a, N, C>(context: &'a C, // Add ourselves to the LRU cache. if let Some(element) = shareable_element { - style_sharing_candidate_cache.insert_if_possible(&element); + style_sharing_candidate_cache.insert_if_possible::<'ln, N>(&element); } } StyleSharingResult::StyleWasShared(index, damage) => { |