Merge the Sky Engine changes from the SkyDart branch

sky/engine/core/animation/Animation.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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * 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 "sky/engine/config.h"
 #include "sky/engine/core/animation/Animation.h"
 
-#include "sky/engine/bindings/core/v8/Dictionary.h"
-#include "sky/engine/bindings/core/v8/ExceptionState.h"
+#include "sky/engine/bindings2/exception_state.h"
 #include "sky/engine/core/animation/ActiveAnimations.h"
 #include "sky/engine/core/animation/AnimationHelpers.h"
 #include "sky/engine/core/animation/AnimationPlayer.h"
 #include "sky/engine/core/animation/AnimationTimeline.h"
 #include "sky/engine/core/animation/Interpolation.h"
 #include "sky/engine/core/animation/KeyframeEffectModel.h"
 #include "sky/engine/core/dom/Element.h"
 #include "sky/engine/core/rendering/RenderLayer.h"
 
 namespace blink {
 
 PassRefPtr<Animation> Animation::create(Element* target, PassRefPtr<AnimationEffect> effect, const Timing& timing, Priority priority, PassOwnPtr<EventDelegate> eventDelegate)
 {
     return adoptRef(new Animation(target, effect, timing, priority, eventDelegate));
 }
 
-PassRefPtr<Animation> Animation::create(Element* element, PassRefPtr<AnimationEffect> effect, const Dictionary& timingInputDictionary)
+PassRefPtr<Animation> Animation::create(Element* element, double duration, ExceptionState&)
 {
-    return create(element, effect, TimingInput::convert(timingInputDictionary));
+    return create(element, PassRefPtr<AnimationEffect>(), TimingInput::convert(duration));
 }
-PassRefPtr<Animation> Animation::create(Element* element, PassRefPtr<AnimationEffect> effect, double duration)
+PassRefPtr<Animation> Animation::create(Element* element, ExceptionState& es)
 {
-    return create(element, effect, TimingInput::convert(duration));
-}
-PassRefPtr<Animation> Animation::create(Element* element, PassRefPtr<AnimationEffect> effect)
-{
-    return create(element, effect, Timing());
-}
-PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, ExceptionState& exceptionState)
-{
-    return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), TimingInput::convert(timingInputDictionary));
-}
-PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState& exceptionState)
-{
-    return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), TimingInput::convert(duration));
-}
-PassRefPtr<Animation> Animation::create(Element* element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)
-{
-    return create(element, EffectInput::convert(element, keyframeDictionaryVector, exceptionState), Timing());
+    return create(element, 0.0, es);
 }
 
 Animation::Animation(Element* target, PassRefPtr<AnimationEffect> effect, const Timing& timing, Priority priority, PassOwnPtr<EventDelegate> eventDelegate)
     : AnimationNode(timing, eventDelegate)
     , m_target(target)
     , m_effect(effect)
     , m_sampledEffect(nullptr)
     , m_priority(priority)
 {
     if (m_target)
@@ skipping 123 matching lines @@
     // clear m_sampledEffect first.
     m_target = nullptr;
     clearEventDelegate();
     SampledEffect* sampledEffect = m_sampledEffect;
     m_sampledEffect = nullptr;
     if (sampledEffect)
         sampledEffect->clear();
 }
 
 } // namespace blink