diff --git a/components/style/gecko/generated/bindings.rs b/components/style/gecko/generated/bindings.rs index 4d8a4767766..256b783dc41 100644 --- a/components/style/gecko/generated/bindings.rs +++ b/components/style/gecko/generated/bindings.rs @@ -2695,8 +2695,8 @@ extern "C" { } extern "C" { pub fn Servo_ResolveStyle(element: RawGeckoElementBorrowed, - set: RawServoStyleSetBorrowed, - allow_stale: bool) -> ServoComputedValuesStrong; + set: RawServoStyleSetBorrowed) + -> ServoComputedValuesStrong; } extern "C" { pub fn Servo_ResolvePseudoStyle(element: RawGeckoElementBorrowed, diff --git a/components/style/gecko/generated/structs_debug.rs b/components/style/gecko/generated/structs_debug.rs index a8cbd1d1149..7219082d03f 100644 --- a/components/style/gecko/generated/structs_debug.rs +++ b/components/style/gecko/generated/structs_debug.rs @@ -38444,7 +38444,7 @@ pub mod root { root::nsCharTraits ) )); } #[test] - fn __bindgen_test_layout__bindgen_ty_id_214707_instantiation_100() { + fn __bindgen_test_layout__bindgen_ty_id_214705_instantiation_100() { assert_eq!(::std::mem::size_of::() , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( u8 ) )); @@ -38453,7 +38453,7 @@ pub mod root { ) )); } #[test] - fn __bindgen_test_layout__bindgen_ty_id_214743_instantiation_101() { + fn __bindgen_test_layout__bindgen_ty_id_214741_instantiation_101() { assert_eq!(::std::mem::size_of::() , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( u8 ) )); diff --git a/components/style/gecko/generated/structs_release.rs b/components/style/gecko/generated/structs_release.rs index 404ca250ed1..bfc238b5428 100644 --- a/components/style/gecko/generated/structs_release.rs +++ b/components/style/gecko/generated/structs_release.rs @@ -37769,7 +37769,7 @@ pub mod root { root::nsCharTraits ) )); } #[test] - fn __bindgen_test_layout__bindgen_ty_id_210969_instantiation_98() { + fn __bindgen_test_layout__bindgen_ty_id_210967_instantiation_98() { assert_eq!(::std::mem::size_of::() , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( u8 ) )); @@ -37778,7 +37778,7 @@ pub mod root { ) )); } #[test] - fn __bindgen_test_layout__bindgen_ty_id_211005_instantiation_99() { + fn __bindgen_test_layout__bindgen_ty_id_211003_instantiation_99() { assert_eq!(::std::mem::size_of::() , 1usize , concat ! ( "Size of template specialization: " , stringify ! ( u8 ) )); diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index fc4110626aa..eabbdfd246c 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -2692,21 +2692,14 @@ pub extern "C" fn Servo_TakeChangeHint(element: RawGeckoElementBorrowed) -> nsCh #[no_mangle] pub extern "C" fn Servo_ResolveStyle(element: RawGeckoElementBorrowed, - raw_data: RawServoStyleSetBorrowed, - allow_stale: bool) + raw_data: RawServoStyleSetBorrowed) -> ServoComputedValuesStrong { let element = GeckoElement(element); debug!("Servo_ResolveStyle: {:?}", element); let data = unsafe { element.ensure_data() }.borrow(); - let valid_styles = if allow_stale { - data.has_styles() - } else { - element.has_current_styles(&*data) - }; - - if !valid_styles { + if !element.has_current_styles(&*data) { debug_assert!(false, "Resolving style on element without current styles with lazy \ computation forbidden."); let per_doc_data = PerDocumentStyleData::from_ffi(raw_data).borrow();