Use IDL union for Timing.duration

Source/core/animation/AnimationNodeTiming.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 "config.h"
 #include "core/animation/AnimationNodeTiming.h"
 
 #include "bindings/core/v8/UnionTypesCore.h"
 #include "core/animation/Animation.h"
 #include "core/animation/AnimationNode.h"
@@ skipping 29 matching lines @@
 double AnimationNodeTiming::iterationStart()
 {
     return m_parent->specifiedTiming().iterationStart;
 }
 
 double AnimationNodeTiming::iterations()
 {
     return m_parent->specifiedTiming().iterationCount;
 }
 
-// This logic was copied from the example in bindings/tests/idls/TestInterface.idl
-// and bindings/tests/results/V8TestInterface.cpp.
-// FIXME: It might be possible to have 'duration' defined as an attribute in the idl.
-// If possible, fix will be in a follow-up patch.
-// http://crbug.com/240176
-void AnimationNodeTiming::getDuration(String propertyName, DoubleOrString& returnValue)
+void AnimationNodeTiming::duration(DoubleOrString& returnValue)
 {
-    if (propertyName != "duration")
-        return;
-
-    if (std::isnan(m_parent->specifiedTiming().iterationDuration)) {
+    if (std::isnan(m_parent->specifiedTiming().iterationDuration))
         returnValue.setString("auto");
-        return;
-    }
-    returnValue.setDouble(m_parent->specifiedTiming().iterationDuration * 1000);
-    return;
+    else
+        returnValue.setDouble(m_parent->specifiedTiming().iterationDuration * 1000);
 }
 
 double AnimationNodeTiming::playbackRate()
 {
     return m_parent->specifiedTiming().playbackRate;
 }
 
 String AnimationNodeTiming::direction()
 {
     return Timing::playbackDirectionString(m_parent->specifiedTiming().direction);
@@ skipping 32 matching lines @@
     m_parent->updateSpecifiedTiming(timing);
 }
 
 void AnimationNodeTiming::setIterations(double iterations)
 {
     Timing timing = m_parent->specifiedTiming();
     TimingInput::setIterationCount(timing, iterations);
     m_parent->updateSpecifiedTiming(timing);
 }
 
-bool AnimationNodeTiming::setDuration(String name, double duration)
+void AnimationNodeTiming::setDuration(const DoubleOrString& durationOrAuto)
 {
-    if (name != "duration")
-        return false;
+    // Any strings other than "auto" are coerced to "auto".
+    double duration = durationOrAuto.isString() ? std::numeric_limits<double>::quiet_NaN() : durationOrAuto.getAsDouble();
     Timing timing = m_parent->specifiedTiming();
     TimingInput::setIterationDuration(timing, duration);
     m_parent->updateSpecifiedTiming(timing);
-    return true;
 }
 
 void AnimationNodeTiming::setPlaybackRate(double playbackRate)
 {
     Timing timing = m_parent->specifiedTiming();
     TimingInput::setPlaybackRate(timing, playbackRate);
     m_parent->updateSpecifiedTiming(timing);
 }
 
 void AnimationNodeTiming::setDirection(String direction)
 {
     Timing timing = m_parent->specifiedTiming();
     TimingInput::setPlaybackDirection(timing, direction);
     m_parent->updateSpecifiedTiming(timing);
 }
 
 void AnimationNodeTiming::setEasing(String easing)
 {
     Timing timing = m_parent->specifiedTiming();
     TimingInput::setTimingFunction(timing, easing);
     m_parent->updateSpecifiedTiming(timing);
 }
 
 void AnimationNodeTiming::trace(Visitor* visitor)
 {
     visitor->trace(m_parent);
 }
 
 } // namespace blink