mirrors/gecko-dev
1
0
Fork 1
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-11-09 04:39:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 1632363 - Fix some warnings introduced by the previous patches.

Browse source 
MANUAL PUSH: Avoid reviewer information from previous patches from
getting lost.
This commit is contained in:
Emilio Cobos Álvarez 2020-04-23 05:02:03 +02:00
parent 2561f2d680
commit 6341ebf29a
2 changed files with 7 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
servo/components/style/animation.rs
View file

@ -12,10 +12,12 @@ use crate::bezier::Bezier;
use crate::context::SharedStyleContext; use crate::context::SharedStyleContext;
use crate::dom::{OpaqueNode, TElement}; use crate::dom::{OpaqueNode, TElement};
use crate::font_metrics::FontMetricsProvider; use crate::font_metrics::FontMetricsProvider;
use crate::properties::animated_properties::{AnimatedProperty, TransitionPropertyIteration}; use crate::properties::animated_properties::AnimatedProperty;
use crate::properties::longhands::animation_direction::computed_value::single_value::T as AnimationDirection; use crate::properties::longhands::animation_direction::computed_value::single_value::T as AnimationDirection;
use crate::properties::longhands::animation_play_state::computed_value::single_value::T as AnimationPlayState; use crate::properties::longhands::animation_play_state::computed_value::single_value::T as AnimationPlayState;
use crate::properties::{self, CascadeMode, ComputedValues, LonghandId, LonghandIdSet}; use crate::properties::{self, CascadeMode, ComputedValues, LonghandId};
#[cfg(feature = "servo")]
use crate::properties::LonghandIdSet;
use crate::stylesheets::keyframes_rule::{KeyframesAnimation, KeyframesStep, KeyframesStepValue}; use crate::stylesheets::keyframes_rule::{KeyframesAnimation, KeyframesStep, KeyframesStepValue};
use crate::stylesheets::Origin; use crate::stylesheets::Origin;
use crate::timer::Timer; use crate::timer::Timer;
@ -432,6 +434,8 @@ pub fn start_transitions_if_applicable(
expired_transitions: &[PropertyAnimation], expired_transitions: &[PropertyAnimation],
running_animations: &[Animation], running_animations: &[Animation],
) -> LonghandIdSet { ) -> LonghandIdSet {
use crate::properties::animated_properties::TransitionPropertyIteration;
// If the style of this element is display:none, then we don't start any transitions // If the style of this element is display:none, then we don't start any transitions
// and we cancel any currently running transitions by returning an empty LonghandIdSet. // and we cancel any currently running transitions by returning an empty LonghandIdSet.
if new_style.get_box().clone_display().is_none() { if new_style.get_box().clone_display().is_none() {

4
servo/ports/geckolib/glue.rs
View file

@ -349,9 +349,7 @@ pub extern "C" fn Servo_TraverseSubtree(
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_MaybeGCRuleTree(raw_data: &RawServoStyleSet) { pub extern "C" fn Servo_MaybeGCRuleTree(raw_data: &RawServoStyleSet) {
let per_doc_data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut(); let per_doc_data = PerDocumentStyleData::from_ffi(raw_data).borrow_mut();
unsafe { per_doc_data.stylist.rule_tree().maybe_gc();
per_doc_data.stylist.rule_tree().maybe_gc();
}
} }
#[no_mangle] #[no_mangle]