Move "id" from KeyframeEffectOptions to KeyframeAnimationOptions and

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 "bindings/core/v8/UnrestrictedDoubleOrKeyframeAnimationOptions.h"
 #include "bindings/core/v8/UnrestrictedDoubleOrKeyframeEffectOptions.h"
 #include "core/animation/AnimationInputHelpers.h"
 #include "core/animation/KeyframeEffectOptions.h"
 
 namespace blink {
 
 void TimingInput::SetStartDelay(Timing& timing, double start_delay) {
   if (std::isfinite(start_delay))
     timing.start_delay = start_delay / 1000;
   else
@@ skipping 113 matching lines @@
   } else if (options.isUnrestrictedDouble()) {
     return Convert(options.getAsUnrestrictedDouble(), timing_output,
                    exception_state);
   } else if (options.isNull()) {
     return true;
   }
   NOTREACHED();
   return false;
 }
 
+bool TimingInput::Convert(
+    const UnrestrictedDoubleOrKeyframeAnimationOptions& options,
+    Timing& timing_output,
+    Document* document,
+    ExceptionState& exception_state) {
+  if (options.isKeyframeAnimationOptions()) {
+    return Convert(options.getAsKeyframeAnimationOptions(), timing_output,
+                   document, exception_state);
+  } else if (options.isUnrestrictedDouble()) {
+    return Convert(options.getAsUnrestrictedDouble(), timing_output,
+                   exception_state);
+  } else if (options.isNull()) {
+    return true;
+  }
+  NOTREACHED();
+  return false;
+}
+
 bool TimingInput::Convert(const KeyframeEffectOptions& timing_input,
                           Timing& timing_output,
                           Document* document,
                           ExceptionState& exception_state) {
   SetStartDelay(timing_output, timing_input.delay());
   SetEndDelay(timing_output, timing_input.endDelay());
   SetFillMode(timing_output, timing_input.fill());
 
   if (!SetIterationStart(timing_output, timing_input.iterationStart(),
                          exception_state))
@@ skipping 12 matching lines @@
 
   if (!SetTimingFunction(timing_output, timing_input.easing(), document,
                          exception_state))
     return false;
 
   timing_output.AssertValid();
 
   return true;
 }
 
+bool TimingInput::Convert(const KeyframeAnimationOptions& timing_input,
+                          Timing& timing_output,
+                          Document* document,
+                          ExceptionState& exception_state) {
+  // The "id" field isn't used, so upcast to KeyframeEffectOptions.
+  const KeyframeEffectOptions* const timing_input_ptr = &timing_input;
+  return Convert(*timing_input_ptr, timing_output, document, exception_state);
+}
+
 bool TimingInput::Convert(double duration,
                           Timing& timing_output,
                           ExceptionState& exception_state) {
   DCHECK(timing_output == Timing::Defaults());
   return SetIterationDuration(
       timing_output,
       UnrestrictedDoubleOrString::fromUnrestrictedDouble(duration),
       exception_state);
 }
 
 }  // namespace blink