Web Animations API: Sort keyframes by offset

Source/core/animation/EffectInput.cpp

Index: Source/core/animation/EffectInput.cpp
diff --git a/Source/core/animation/EffectInput.cpp b/Source/core/animation/EffectInput.cpp
index 8e29bd8af94b7cc39935f1424c521f9e612da42e..e2f35a0d96a4a1c9c3b235d7ac8e183f576ea0ee 100644
--- a/Source/core/animation/EffectInput.cpp
+++ b/Source/core/animation/EffectInput.cpp
@@ -38,6 +38,7 @@
 #include "core/css/parser/BisonCSSParser.h"
 #include "core/css/resolver/StyleResolver.h"
 #include "core/dom/Element.h"
+#include "wtf/NonCopyingSort.h"
 
 namespace WebCore {
 
@@ -59,14 +60,37 @@ PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c
 
     StyleSheetContents* styleSheetContents = element->document().elementSheet().contents();
     StringKeyframeVector keyframes;
+    bool everyFrameHasOffset = true;
+    bool looselySortedByOffset = true;
+    double lastOffset = -std::numeric_limits<double>::infinity();
 
     for (size_t i = 0; i < keyframeDictionaryVector.size(); ++i) {
         RefPtrWillBeRawPtr<StringKeyframe> keyframe = StringKeyframe::create();
-        keyframes.append(keyframe);
 
+        bool frameHasOffset = false;
         double offset;
-        if (keyframeDictionaryVector[i].get("offset", offset))
-            keyframe->setOffset(offset);
+        if (keyframeDictionaryVector[i].get("offset", offset)) {
+            // Keyframes with offsets outside the range [0.0, 1.0] are ignored.
+            if (isNull(offset) || offset < 0 || offset > 1)

[dstockwell, 2014/04/29 09:10:09]

this should probably use std isnan rather than isnull for clarity

[alancutter (OOO until 2018), 2014/04/29 09:12:23]

Done.

+                continue;
+
+            frameHasOffset = true;
+            // The JS value null get converted to 0 so we need to check whether the original value is null.

[dstockwell, 2014/04/29 09:10:09]

gets

[alancutter (OOO until 2018), 2014/04/29 09:12:23]

Done.

+            if (offset == 0) {
+                ScriptValue scriptValue;
+                if (keyframeDictionaryVector[i].get("offset", scriptValue) && scriptValue->isNull())
+                    frameHasOffset = false;
+            }
+            if (frameHasOffset) {
+                keyframe->setOffset(offset);
+                if (offset < lastOffset)
+                    looselySortedByOffset = false;
+                lastOffset = offset;
+            }
+        }
+        everyFrameHasOffset = everyFrameHasOffset && frameHasOffset;
+
+        keyframes.append(keyframe);
 
         String compositeString;
         keyframeDictionaryVector[i].get("composite", compositeString);
@@ -93,6 +117,14 @@ PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c
         }
     }
 
+    if (!looselySortedByOffset) {
+        if (!everyFrameHasOffset) {
+            exceptionState.throwDOMException(InvalidModificationError, "Keyframes are not loosely sorted by offset.");
+            return nullptr;
+        }
+        nonCopyingSort(keyframes.begin(), keyframes.end(), Keyframe::compareOffsets);
+    }
+
     RefPtrWillBeRawPtr<StringKeyframeEffectModel> keyframeEffectModel = StringKeyframeEffectModel::create(keyframes);
     if (!keyframeEffectModel->isReplaceOnly()) {
         exceptionState.throwDOMException(NotSupportedError, "Partial keyframes are not supported.");