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

Auto merge of #14582 - heycam:cfg, r=emilio

Browse source 
fix feature check for Gecko-specific assertions

r? @emilio

<!-- 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/14582)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-12-14 05:13:17 -08:00 • committed by GitHub
commit 65b891c23f
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/dom.rs
View file

@ -250,7 +250,7 @@ pub trait TElement : PartialEq + Debug + Sized + Copy + Clone + ElementExt + Pre
let data = self.borrow_data().unwrap(); let data = self.borrow_data().unwrap();
// See the comment on `cascade_node` about getting the up-to-date parent // See the comment on `cascade_node` about getting the up-to-date parent
// style for why we allow this on Gecko. // style for why we allow this on Gecko.
debug_assert!(cfg!(gecko) || data.has_current_styles()); debug_assert!(cfg!(feature = "gecko") || data.has_current_styles());
data.styles().is_display_none() data.styles().is_display_none()
} }

2
components/style/matching.rs
View file

@ -739,7 +739,7 @@ pub trait MatchMethods : TElement {
// some small piece of newly-added content in order to do something // some small piece of newly-added content in order to do something
// specific with that frame, but not wanting to flush all of // specific with that frame, but not wanting to flush all of
// layout). // layout).
debug_assert!(cfg!(gecko) || d.has_current_styles()); debug_assert!(cfg!(feature = "gecko") || d.has_current_styles());
&d.styles().primary.values &d.styles().primary.values
}); });