diff options
| -rw-r--r-- | components/style/gecko_bindings/bindings.rs | 8 | ||||
| -rw-r--r-- | ports/geckolib/glue.rs | 34 |
2 files changed, 2 insertions, 40 deletions
diff --git a/components/style/gecko_bindings/bindings.rs b/components/style/gecko_bindings/bindings.rs index eb691fafedc..4f414b5316d 100644 --- a/components/style/gecko_bindings/bindings.rs +++ b/components/style/gecko_bindings/bindings.rs @@ -1272,14 +1272,6 @@ extern "C" { -> RawServoDeclarationBlockStrong; } extern "C" { - pub fn Servo_RestyleWithAddedDeclaration(set: RawServoStyleSetBorrowed, - declarations: - RawServoDeclarationBlockBorrowed, - previous_style: - ServoComputedValuesBorrowed) - -> ServoComputedValuesStrong; -} -extern "C" { pub fn Servo_AnimationValues_Populate(arg1: RawGeckoAnimationValueListBorrowedMut, arg2: diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index e7db6b9f4a2..7a3fb5832ae 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -64,10 +64,10 @@ use style::gecko_properties::style_structs; use style::keyframes::KeyframesStepValue; use style::parallel; use style::parser::{ParserContext, ParserContextExtraData}; -use style::properties::{CascadeFlags, ComputedValues, Importance, PropertyDeclaration}; +use style::properties::{ComputedValues, Importance, PropertyDeclaration}; use style::properties::{PropertyDeclarationParseResult, PropertyDeclarationBlock, PropertyId}; -use style::properties::{apply_declarations, parse_one_declaration}; use style::properties::animated_properties::{AnimationValue, Interpolate, TransitionProperty}; +use style::properties::parse_one_declaration; use style::restyle_hints::RestyleHint; use style::selector_parser::PseudoElementCascadeType; use style::sequential; @@ -332,36 +332,6 @@ pub extern "C" fn Servo_AnimationValue_Release(anim: RawServoAnimationValueBorro } #[no_mangle] -pub extern "C" fn Servo_RestyleWithAddedDeclaration(raw_data: RawServoStyleSetBorrowed, - declarations: RawServoDeclarationBlockBorrowed, - previous_style: ServoComputedValuesBorrowed) - -> ServoComputedValuesStrong -{ - let previous_style = ComputedValues::as_arc(&previous_style); - let declarations = RwLock::<PropertyDeclarationBlock>::as_arc(&declarations); - - let guard = declarations.read(); - - let declarations = || { - guard.declarations.iter().rev().map(|&(ref decl, _importance)| decl) - }; - - let data = PerDocumentStyleData::from_ffi(raw_data).borrow(); - - // FIXME (bug 1303229): Use the actual viewport size here - let computed = apply_declarations(Size2D::new(Au(0), Au(0)), - /* is_root_element = */ false, - declarations, - previous_style, - data.default_computed_values(), - None, - Box::new(StdoutErrorReporter), - None, - CascadeFlags::empty()); - Arc::new(computed).into_strong() -} - -#[no_mangle] pub extern "C" fn Servo_StyleWorkerThreadCount() -> u32 { *NUM_THREADS as u32 } |