Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1331213: Implement the resolution override. r=heycam

Browse source 
MozReview-Commit-ID: LFGam2hDoh7
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
This commit is contained in:
Emilio Cobos Álvarez 2017-01-16 10:42:10 +01:00
parent 13878d674c
commit 3b36f4c58e
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/style/gecko/media_queries.rs
View file

@ -535,11 +535,16 @@ impl Expression {
(one_num * other_den).partial_cmp(&(other_num * one_den)).unwrap()
}
(&Resolution(ref one), &Resolution(ref other)) => {
// FIXME(emilio): The pres context may override the DPPX of the
// `other` resolution, we need to look at that here, but I'm
// skipping that for now (we should check if bindgen can
// generate nsPresContext correctly now).
one.to_dpi().partial_cmp(&other.to_dpi()).unwrap()
let actual_dpi = unsafe {
if (*device.pres_context).mOverrideDPPX > 0.0 {
self::Resolution::Dppx((*device.pres_context).mOverrideDPPX)
.to_dpi()
} else {
other.to_dpi()
}
};
one.to_dpi().partial_cmp(&actual_dpi).unwrap()
}
(&Ident(ref one), &Ident(ref other)) => {
debug_assert!(self.feature.mRangeType != nsMediaFeature_RangeType::eMinMaxAllowed);