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

style: Don't reset the default computed values if they cannot change.

Browse source 
This actually fixes the bug.

Bug: 1435939
Reviewed-by: xidorn
MozReview-Commit-ID: AejqMLZzpQp
This commit is contained in:
Emilio Cobos Álvarez 2018-02-06 15:17:10 +01:00
parent d9ae47cb13
commit 9324feb994
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ports/geckolib/glue.rs
View file

@ -1121,9 +1121,10 @@ pub extern "C" fn Servo_StyleSet_AppendStyleSheet(
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_StyleSet_MediumFeaturesChanged( pub unsafe extern "C" fn Servo_StyleSet_MediumFeaturesChanged(
raw_data: RawServoStyleSetBorrowed, raw_data: RawServoStyleSetBorrowed,
viewport_units_used: *mut bool, viewport_units_used: *mut bool,
may_affect_default_style: bool,
) -> u8 { ) -> u8 {
let global_style_data = &*GLOBAL_STYLE_DATA; let global_style_data = &*GLOBAL_STYLE_DATA;
let guard = global_style_data.shared_lock.read(); let guard = global_style_data.shared_lock.read();
@ -1140,10 +1141,15 @@ pub extern "C" fn Servo_StyleSet_MediumFeaturesChanged(
// less often. // less often.
let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut(); let mut data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
unsafe { *viewport_units_used = data.stylist.device().used_viewport_size();
*viewport_units_used = data.stylist.device().used_viewport_size(); if may_affect_default_style {
// FIXME(emilio): It's a shame we do this too for XBL stuff, but we need
// to right now to evaluate relative units in media queries correctly.
//
// We should instead just pass the `Device` reference from the master
// stylist, but that looked kinda gross... Maybe it's not actually.
data.stylist.device_mut().reset_computed_values();
} }
data.stylist.device_mut().reset_computed_values();
let guards = StylesheetGuards::same(&guard); let guards = StylesheetGuards::same(&guard);
let origins_in_which_rules_changed = let origins_in_which_rules_changed =
data.stylist.media_features_change_changed_style(&guards); data.stylist.media_features_change_changed_style(&guards);