Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-13 02:13:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19438 - emilio:redundant-sharing, r=upsuper

Browse source 
style: Remove redundant style sharing check.

We check that a few lines before calling test_candidate.

<!-- 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/19438)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-30 10:45:14 -06:00 • committed by GitHub
commit ec794c8297
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/sharing/mod.rs
View file

@ -648,6 +648,8 @@ impl<E: TElement> StyleSharingCache<E> {
nth_index_cache: &mut NthIndexCache,
selector_flags_map: &mut SelectorFlagsMap<E>
) -> Option<ResolvedElementStyles> {
debug_assert!(!target.is_native_anonymous());
// Check that we have the same parent, or at least that the parents
// share styles and permit sharing across their children. The latter
// check allows us to share style between cousins if the parents
@ -657,13 +659,6 @@ impl<E: TElement> StyleSharingCache<E> {
return None;
}
if target.is_native_anonymous() {
debug_assert!(!candidate.element.is_native_anonymous(),
"Why inserting NAC into the cache?");
trace!("Miss: Native Anonymous Content");
return None;
}
// Note that in the XBL case, we should be able to assert that the
// scopes are different, since two elements with different XBL bindings
// need to necessarily have different style (and thus children of them