Bug 1311620 - Part 5: Implement effect composite(add). r?birtles draft
authorHiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Sat, 24 Dec 2016 19:54:42 +0900
changeset 453698 9a38581a2d147cbc30b88c72979534c8a9a86062
parent 453697 843f1bb2f8d2f7b991170763589cc4d207f8defc
child 453699 9e194f4ffc7d7147eb1b4452b33587542802b510
push id39729
push userhiikezoe@mozilla-japan.org
push dateSat, 24 Dec 2016 11:23:17 +0000
reviewersbirtles
bugs1311620
milestone53.0a1
Bug 1311620 - Part 5: Implement effect composite(add). r?birtles MozReview-Commit-ID: 7t6CD3VibNS
dom/animation/KeyframeEffectReadOnly.cpp
testing/web-platform/meta/web-animations/animation-model/combining-effects/effect-composition.html.ini
--- a/dom/animation/KeyframeEffectReadOnly.cpp
+++ b/dom/animation/KeyframeEffectReadOnly.cpp
@@ -648,20 +648,17 @@ KeyframeEffectParamsFromUnion(const Opti
                                        result.mPacedProperty,
                                        aInvalidPacedProperty,
                                        aCallerType,
                                        aRv);
     // Ignore iterationComposite if the Web Animations API is not enabled,
     // then the default value 'Replace' will be used.
     if (AnimationUtils::IsCoreAPIEnabledForCaller(aCallerType)) {
       result.mIterationComposite = options.mIterationComposite;
-      // FIXME: Bug 1311620: We don't support additive animation yet.
-      if (options.mComposite != dom::CompositeOperation::Add) {
-        result.mComposite = options.mComposite;
-      }
+      result.mComposite = options.mComposite;
     }
   }
   return result;
 }
 
 /* static */ Maybe<OwningAnimationTarget>
 KeyframeEffectReadOnly::ConvertTarget(
   const Nullable<ElementOrCSSPseudoElement>& aTarget)
deleted file mode 100644
--- a/testing/web-platform/meta/web-animations/animation-model/combining-effects/effect-composition.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[effect-composition.html]
-  type: testharness
-  [add specified on a keyframe overrides the composite mode of the effect]
-    expected: FAIL
-