diff --git a/Libraries/LibWeb/Animations/KeyframeEffect.cpp b/Libraries/LibWeb/Animations/KeyframeEffect.cpp index ffd7d6f7a6b..029013efab6 100644 --- a/Libraries/LibWeb/Animations/KeyframeEffect.cpp +++ b/Libraries/LibWeb/Animations/KeyframeEffect.cpp @@ -152,30 +152,21 @@ static WebIDL::ExceptionOr> process_a_keyframe_like_object(JS:: auto input_properties = TRY(keyframe_object.enumerable_own_property_names(JS::Object::PropertyKind::Key)); Vector animation_properties; - Optional all_value; for (auto const& input_property : input_properties) { if (!input_property.is_string()) continue; auto name = input_property.as_string().utf8_string(); - if (name == "all"sv) { - all_value = TRY(keyframe_object.get(vm.names.all)); - for (auto i = to_underlying(CSS::first_longhand_property_id); i <= to_underlying(CSS::last_longhand_property_id); ++i) { - auto property = static_cast(i); - if (CSS::is_animatable_property(property)) - animation_properties.append(String { CSS::string_from_property_id(property) }); - } - } else { - // Handle the two special cases - if (name == "cssFloat"sv || name == "cssOffset"sv) { + + // Handle the two special cases + if (name == "cssFloat"sv || name == "cssOffset"sv) { + animation_properties.append(name); + } else if (name == "float"sv || name == "offset"sv) { + // Ignore these property names + } else if (auto property = CSS::property_id_from_camel_case_string(name); property.has_value()) { + if (CSS::is_animatable_property(property.value())) animation_properties.append(name); - } else if (name == "float"sv || name == "offset"sv) { - // Ignore these property names - } else if (auto property = CSS::property_id_from_camel_case_string(name); property.has_value()) { - if (CSS::is_animatable_property(property.value())) - animation_properties.append(name); - } } } @@ -188,7 +179,7 @@ static WebIDL::ExceptionOr> process_a_keyframe_like_object(JS:: // as the property key and keyframe input as the receiver. // 2. Check the completion record of raw value. JS::PropertyKey key { Utf16FlyString::from_utf8(property_name), JS::PropertyKey::StringMayBeNumber::No }; - auto raw_value = TRY(keyframe_object.has_property(key)) ? TRY(keyframe_object.get(key)) : *all_value; + auto raw_value = TRY(keyframe_object.get(key)); using PropertyValuesType = Conditional, String>; PropertyValuesType property_values; diff --git a/Libraries/LibWeb/CSS/Parser/PropertyParsing.cpp b/Libraries/LibWeb/CSS/Parser/PropertyParsing.cpp index 082d8c02c63..46aa2863c6f 100644 --- a/Libraries/LibWeb/CSS/Parser/PropertyParsing.cpp +++ b/Libraries/LibWeb/CSS/Parser/PropertyParsing.cpp @@ -5146,15 +5146,11 @@ RefPtr Parser::parse_transition_property_value(TokenStreamis_keyword()) { - auto keyword = property_value->as_keyword().keyword(); - if (keyword == Keyword::None) { - properties.append({}); - continue; - } - if (keyword == Keyword::All) - properties_for_this_transition = expanded_longhands_for_shorthand(PropertyID::All); + VERIFY(property_value->to_keyword() == Keyword::None); + properties.append({}); + continue; } else { auto maybe_property = property_id_from_string(property_value->as_custom_ident().custom_ident()); if (!maybe_property.has_value()) {