Web Animations: Coalesce constructors where possible.

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

 // Copyright 2016 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/KeyframeEffectReadOnly.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/UnrestrictedDoubleOrKeyframeEffectOptions.h"
 #include "core/animation/Animation.h"
 #include "core/animation/CompositorAnimations.h"
 #include "core/animation/EffectInput.h"
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/Interpolation.h"
 #include "core/animation/KeyframeEffect.h"
 #include "core/animation/KeyframeEffectOptions.h"
 #include "core/animation/PropertyHandle.h"
 #include "core/animation/SampledEffect.h"
 #include "core/animation/TimingInput.h"
@@ skipping 12 matching lines @@
     Priority priority,
     EventDelegate* event_delegate) {
   return new KeyframeEffectReadOnly(target, model, timing, priority,
                                     event_delegate);
 }
 
 KeyframeEffectReadOnly* KeyframeEffectReadOnly::Create(
     ExecutionContext* execution_context,
     Element* element,
     const DictionarySequenceOrDictionary& effect_input,
-    double duration,
+    const UnrestrictedDoubleOrKeyframeEffectOptions& options,
     ExceptionState& exception_state) {
   DCHECK(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
   if (element) {
-    UseCounter::Count(
-        element->GetDocument(),
-        UseCounter::kAnimationConstructorKeyframeListEffectObjectTiming);
-  }
-  Timing timing;
-  if (!TimingInput::Convert(duration, timing, exception_state))
-    return nullptr;
-  return Create(element,
-                EffectInput::Convert(element, effect_input, execution_context,
-                                     exception_state),
-                timing);
-}
-
-KeyframeEffectReadOnly* KeyframeEffectReadOnly::Create(
-    ExecutionContext* execution_context,
-    Element* element,
-    const DictionarySequenceOrDictionary& effect_input,
-    const KeyframeEffectOptions& timing_input,
-    ExceptionState& exception_state) {
-  DCHECK(RuntimeEnabledFeatures::webAnimationsAPIEnabled());
-  if (element) {
     UseCounter::Count(
         element->GetDocument(),
         UseCounter::kAnimationConstructorKeyframeListEffectObjectTiming);
   }
   Timing timing;
   Document* document = element ? &element->GetDocument() : nullptr;
-  if (!TimingInput::Convert(timing_input, timing, document, exception_state))
+  if (!TimingInput::Convert(options, timing, document, exception_state))
     return nullptr;
   return Create(element,
                 EffectInput::Convert(element, effect_input, execution_context,
                                      exception_state),
                 timing);
 }
 
 KeyframeEffectReadOnly* KeyframeEffectReadOnly::Create(
     ExecutionContext* execution_context,
     Element* element,
@@ skipping 293 matching lines @@
 }
 
 DEFINE_TRACE(KeyframeEffectReadOnly) {
   visitor->Trace(target_);
   visitor->Trace(model_);
   visitor->Trace(sampled_effect_);
   AnimationEffectReadOnly::Trace(visitor);
 }
 
 }  // namespace blink