Throw TypeError if easing string is invalid.

third_party/WebKit/Source/core/animation/TimingInput.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/animation/TimingInput.h"
 
+#include "bindings/core/v8/ExceptionState.h"
 #include "core/animation/AnimationInputHelpers.h"
 #include "core/animation/KeyframeEffectOptions.h"
 
 namespace blink {
 
 void TimingInput::setStartDelay(Timing& timing, double startDelay)
 {
     if (std::isfinite(startDelay))
         timing.startDelay = startDelay / 1000;
     else
@@ skipping 61 matching lines @@
         timing.direction = Timing::PlaybackDirectionReverse;
     } else if (direction == "alternate") {
         timing.direction = Timing::PlaybackDirectionAlternate;
     } else if (direction == "alternate-reverse") {
         timing.direction = Timing::PlaybackDirectionAlternateReverse;
     } else {
         timing.direction = Timing::defaults().direction;
     }
 }
 
-void TimingInput::setTimingFunction(Timing& timing, const String& timingFunctionString, Document* document)
+bool TimingInput::setTimingFunction(Timing& timing, const String& timingFunctionString, Document* document, ExceptionState& exceptionState)
 {
-    if (RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimingFunction(timingFunctionString, document))
+    if (RefPtr<TimingFunction> timingFunction = AnimationInputHelpers::parseTimingFunction(timingFunctionString, document, exceptionState)) {
         timing.timingFunction = timingFunction;
-    else
-        timing.timingFunction = Timing::defaults().timingFunction;
+        return true;
+    }
+    return false;
 }
 
-Timing TimingInput::convert(const KeyframeEffectOptions& timingInput, Document* document)
+bool TimingInput::convert(const KeyframeEffectOptions& timingInput, Timing& timingOutput, Document* document, ExceptionState& exceptionState)
 {
-    Timing result;
+    setStartDelay(timingOutput, timingInput.delay());
+    setEndDelay(timingOutput, timingInput.endDelay());
+    setFillMode(timingOutput, timingInput.fill());
+    setIterationStart(timingOutput, timingInput.iterationStart());
+    setIterationCount(timingOutput, timingInput.iterations());
+    if (timingInput.duration().isUnrestrictedDouble())
+        setIterationDuration(timingOutput, timingInput.duration().getAsUnrestrictedDouble());
+    else
+        setIterationDuration(timingOutput, -1);
+    setPlaybackRate(timingOutput, timingInput.playbackRate());
+    setPlaybackDirection(timingOutput, timingInput.direction());
+    if (!setTimingFunction(timingOutput, timingInput.easing(), document, exceptionState))
+        return false;
 
-    setStartDelay(result, timingInput.delay());
-    setEndDelay(result, timingInput.endDelay());
-    setFillMode(result, timingInput.fill());
-    setIterationStart(result, timingInput.iterationStart());
-    setIterationCount(result, timingInput.iterations());
-    if (timingInput.duration().isUnrestrictedDouble())
-        setIterationDuration(result, timingInput.duration().getAsUnrestrictedDouble());
-    else
-        setIterationDuration(result, -1);
-    setPlaybackRate(result, timingInput.playbackRate());
-    setPlaybackDirection(result, timingInput.direction());
-    setTimingFunction(result, timingInput.easing(), document);
+    timingOutput.assertValid();
 
-    result.assertValid();
-
-    return result;
+    return true;
 }
 
 Timing TimingInput::convert(double duration)
 {
     Timing result;
     setIterationDuration(result, duration);
     return result;
 }
 
 } // namespace blink