diff --git a/third_party/blink/renderer/core/animation/css/css_animations.cc b/third_party/blink/renderer/core/animation/css/css_animations.cc index d305df81b8715f..39e2a0e5c5ed39 100644 --- a/third_party/blink/renderer/core/animation/css/css_animations.cc +++ b/third_party/blink/renderer/core/animation/css/css_animations.cc @@ -1632,8 +1632,7 @@ void CSSAnimations::CalculateAnimationUpdate( if (animation_data && (style_builder.Display() != EDisplay::kNone || - (RuntimeEnabledFeatures::CSSDisplayAnimationEnabled() && old_style && - old_style->Display() != EDisplay::kNone))) { + (old_style && old_style->Display() != EDisplay::kNone))) { const Vector& name_list = animation_data->NameList(); for (wtf_size_t i = 0; i < name_list.size(); ++i) { AtomicString name = name_list[i]; @@ -2366,7 +2365,6 @@ void CSSAnimations::CalculateTransitionUpdateForPropertyHandle( } if (!start || !end) { - DCHECK(RuntimeEnabledFeatures::CSSTransitionDiscreteEnabled()); const Document& document = state.animating_element.GetDocument(); const CSSValue* start_css_value = AnimationUtils::KeyframeValueFromComputedStyle( @@ -2540,11 +2538,6 @@ void CSSAnimations::CalculateTransitionUpdateForStandardProperty( writing_direction.GetWritingMode()); PropertyHandle property_handle = PropertyHandle(property); - if (!RuntimeEnabledFeatures::CSSTransitionDiscreteEnabled() && - !animate_all && !property.IsInterpolable()) { - continue; - } - CalculateTransitionUpdateForPropertyHandle( state, transition_property.property_type, property_handle, transition_index, animate_all); @@ -3165,9 +3158,6 @@ bool CSSAnimations::IsAnimationAffectingProperty(const CSSProperty& property) { case CSSPropertyID::kWillChange: case CSSPropertyID::kWritingMode: return true; - case CSSPropertyID::kDisplay: - case CSSPropertyID::kContentVisibility: - return !RuntimeEnabledFeatures::CSSDisplayAnimationEnabled(); default: return false; } diff --git a/third_party/blink/renderer/core/animation/css_interpolation_types_map.cc b/third_party/blink/renderer/core/animation/css_interpolation_types_map.cc index 4d42327d540172..8147450e8b061a 100644 --- a/third_party/blink/renderer/core/animation/css_interpolation_types_map.cc +++ b/third_party/blink/renderer/core/animation/css_interpolation_types_map.cc @@ -435,12 +435,10 @@ const InterpolationTypes& CSSInterpolationTypesMap::Get( std::make_unique(used_property)); break; case CSSPropertyID::kDisplay: - DCHECK(RuntimeEnabledFeatures::CSSDisplayAnimationEnabled()); applicable_types->push_back( std::make_unique(used_property)); break; case CSSPropertyID::kContentVisibility: - DCHECK(RuntimeEnabledFeatures::CSSDisplayAnimationEnabled()); applicable_types->push_back( std::make_unique( used_property)); diff --git a/third_party/blink/renderer/core/css/css_properties.json5 b/third_party/blink/renderer/core/css/css_properties.json5 index 85d919e24475c3..67bbe3ce6edd12 100644 --- a/third_party/blink/renderer/core/css/css_properties.json5 +++ b/third_party/blink/renderer/core/css/css_properties.json5 @@ -1047,7 +1047,6 @@ is_animation_property: true, // Animation properites are never incremental. supports_incremental_style: false, - runtime_flag: "CSSTransitionDiscrete", }, { name: "transition-timing-function", diff --git a/third_party/blink/renderer/core/css/style_property_shorthand_custom.cc b/third_party/blink/renderer/core/css/style_property_shorthand_custom.cc index c2e26de82feb02..5fff2169089556 100644 --- a/third_party/blink/renderer/core/css/style_property_shorthand_custom.cc +++ b/third_party/blink/renderer/core/css/style_property_shorthand_custom.cc @@ -29,14 +29,6 @@ namespace blink { // change the spec to use this order, see: // https://github.com/w3c/csswg-drafts/issues/4223 const StylePropertyShorthand& transitionShorthandForParsing() { - static const CSSProperty* kTransitionProperties[] = { - &GetCSSPropertyTransitionDuration(), - &GetCSSPropertyTransitionTimingFunction(), - &GetCSSPropertyTransitionDelay(), &GetCSSPropertyTransitionProperty()}; - static StylePropertyShorthand transition_longhands( - CSSPropertyID::kTransition, kTransitionProperties, - std::size(kTransitionProperties)); - static const CSSProperty* kTransitionPropertiesWithAnimationType[] = { &GetCSSPropertyTransitionBehavior(), &GetCSSPropertyTransitionDuration(), &GetCSSPropertyTransitionTimingFunction(), @@ -45,9 +37,7 @@ const StylePropertyShorthand& transitionShorthandForParsing() { CSSPropertyID::kTransition, kTransitionPropertiesWithAnimationType, std::size(kTransitionPropertiesWithAnimationType)); - return RuntimeEnabledFeatures::CSSTransitionDiscreteEnabled() - ? transition_longhands_with_animation_type - : transition_longhands; + return transition_longhands_with_animation_type; } unsigned indexOfShorthandForLonghand( diff --git a/third_party/blink/renderer/core/dom/element.cc b/third_party/blink/renderer/core/dom/element.cc index 12c7140be9fff4..d1805fd8bdf891 100644 --- a/third_party/blink/renderer/core/dom/element.cc +++ b/third_party/blink/renderer/core/dom/element.cc @@ -3955,8 +3955,7 @@ StyleRecalcChange Element::RecalcOwnStyle( // display:none. If new_style is otherwise set to display:none, then it // means an animation set display:none, and an animation shouldn't // cancel itself in this case. - if (base_is_display_none || - !RuntimeEnabledFeatures::CSSDisplayAnimationEnabled()) { + if (base_is_display_none) { element_animations->CssAnimations().Cancel(); } } diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 index bc4e41c89e19a6..29944122050f60 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 @@ -801,10 +801,6 @@ name: "CSSCustomStateNewSyntax", status: "stable", }, - { - name: "CSSDisplayAnimation", - status: "stable", - }, { name: "CSSDisplayModePictureInPicture", status: "stable", @@ -1047,10 +1043,6 @@ name: "CSSTextSpacingTrim", status: "stable", }, - { - name: "CSSTransitionDiscrete", - status: "stable", - }, { // Support for tree-scoped [1] timeline names (e.g. produced by // scroll-timeline).