diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp index 72a153ce79c0..0c809d6b8371 100644 --- a/dom/animation/KeyframeEffect.cpp +++ b/dom/animation/KeyframeEffect.cpp @@ -1804,11 +1804,6 @@ KeyframeEffectReadOnly::GetProperties( nsTArray& aProperties) const { for (const AnimationProperty& property : mProperties) { - // Bug 1252730: We should also expose this winsInCascade as well. - if (!property.mWinsInCascade) { - continue; - } - AnimationPropertyDetails propertyDetails; propertyDetails.mProperty.Construct( NS_ConvertASCIItoUTF16(nsCSSProps::GetStringValue(property.mProperty))); diff --git a/dom/animation/test/chrome/test_animation_property_state.html b/dom/animation/test/chrome/test_animation_property_state.html index 321fa3ca76ce..f9451da0f2e9 100644 --- a/dom/animation/test/chrome/test_animation_property_state.html +++ b/dom/animation/test/chrome/test_animation_property_state.html @@ -13,6 +13,10 @@ height: 100px; background-color: white; } +@keyframes fade { + from { opacity: 1 } + to { opacity: 0 } +} @@ -41,7 +45,7 @@ function compare_property_state(a, b) { } function assert_animation_property_state_equals(actual, expected) { - assert_equals(actual.length, expected.length); + assert_equals(actual.length, expected.length, 'Number of properties'); var sortedActual = actual.sort(compare_property_state); var sortedExpected = expected.sort(compare_property_state); @@ -713,6 +717,21 @@ function start() { [ { property: 'transform', runningOnCompositor: true } ]); })); }, 'transform of nsIFrame with SVG transform'); + + promise_test(function(t) { + var div = addDiv(t, { class: 'compositable', + style: 'animation: fade 100s' }); + var cssAnimation = div.getAnimations()[0]; + var scriptAnimation = div.animate({ opacity: [ 1, 0 ] }, 1000); + return scriptAnimation.ready.then(function() { + assert_animation_property_state_equals( + cssAnimation.effect.getProperties(), + [ { property: 'opacity', runningOnCompositor: false } ]); + assert_animation_property_state_equals( + scriptAnimation.effect.getProperties(), + [ { property: 'opacity', runningOnCompositor: true } ]); + }); + }, 'overridden animation'); }