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

style: Move the overrides to a separate struct in nsPresContext.

Browse source 
Just so that we can keep track of these together.

Differential Revision: https://phabricator.services.mozilla.com/D40247
This commit is contained in:
Emilio Cobos Álvarez 2019-08-01 17:29:01 +02:00
parent 07b8666029
commit e04273a4d9
No known key found for this signature in database
GPG key ID: E1152D0994E4BF8A
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -213,11 +213,11 @@ impl Device {
None => return MediaType::screen(),
};
// Gecko allows emulating random media with mMediaEmulated.
let medium_to_use = if !pc.mMediaEmulated.mRawPtr.is_null() {
pc.mMediaEmulated.mRawPtr
// Gecko allows emulating random media with mMediaEmulationData.mMedium.
let medium_to_use = if !pc.mMediaEmulationData.mMedium.mRawPtr.is_null() {
pc.mMediaEmulationData.mMedium.mRawPtr
} else {
pc.mMedium as *const bindings::nsAtom as *mut _
pc.mMedium as *const structs::nsAtom as *mut _
};
MediaType(CustomIdent(unsafe { Atom::from_raw(medium_to_use) }))
@ -252,9 +252,8 @@ impl Device {
None => return Scale::new(1.),
};
let override_dppx = pc.mOverrideDPPX;
if override_dppx > 0.0 {
return Scale::new(override_dppx);
if pc.mMediaEmulationData.mDPPX > 0.0 {
return Scale::new(pc.mMediaEmulationData.mDPPX);
}
let au_per_dpx = pc.mCurAppUnitsPerDevPixel as f32;