Web Animations: Coalesce constructors where possible.

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/animation/KeyframeEffect.h"
 
 #include "bindings/core/v8/Dictionary.h"
 #include "bindings/core/v8/ExceptionState.h"
+#include "bindings/core/v8/UnrestrictedDoubleOrKeyframeEffectOptions.h"
 #include "core/animation/AnimationEffectTiming.h"
 #include "core/animation/EffectInput.h"
 #include "core/animation/KeyframeEffectOptions.h"
 #include "core/animation/KeyframeEffectReadOnly.h"
 #include "core/animation/TimingInput.h"
 #include "core/dom/Element.h"
 #include "core/frame/UseCounter.h"
 
 namespace blink {
 
 KeyframeEffect* KeyframeEffect::Create(
     Element* target,
     EffectModel* model,
     const Timing& timing,
     KeyframeEffectReadOnly::Priority priority,
     EventDelegate* event_delegate) {
   return new KeyframeEffect(target, model, timing, priority, event_delegate);
 }
 
 KeyframeEffect* KeyframeEffect::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);
-}
-
-KeyframeEffect* KeyframeEffect::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);
 }
 
 KeyframeEffect* KeyframeEffect::Create(
     ExecutionContext* execution_context,
     Element* element,
@@ skipping 18 matching lines @@
                                EventDelegate* event_delegate)
     : KeyframeEffectReadOnly(target, model, timing, priority, event_delegate) {}
 
 KeyframeEffect::~KeyframeEffect() {}
 
 AnimationEffectTiming* KeyframeEffect::timing() {
   return AnimationEffectTiming::Create(this);
 }
 
 }  // namespace blink