Source/core/animation/ElementAnimation.h - Issue 203463009: Web Animations API: Fix Synthetic keyframes + partial keyframes

Side by Side Diff: Source/core/animation/ElementAnimation.h

Issue 203463009: Web Animations API: Fix Synthetic keyframes + partial keyframes (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Return nullptr after exception + fixmes Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « Source/core/animation/EffectInput.cpp ('k') | Source/core/animation/ElementAnimation.idl » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
52 static AnimationPlayer* animate(Element& element, PassRefPtrWillBeRawPtr<Ani mationEffect> effect, double duration)	52 static AnimationPlayer* animate(Element& element, PassRefPtrWillBeRawPtr<Ani mationEffect> effect, double duration)

53 {	53 {

54 return animateInternal(element, effect, TimingInput::convert(duration));	54 return animateInternal(element, effect, TimingInput::convert(duration));

55 }	55 }

56	56

57 static AnimationPlayer* animate(Element& element, PassRefPtrWillBeRawPtr<Ani mationEffect> effect)	57 static AnimationPlayer* animate(Element& element, PassRefPtrWillBeRawPtr<Ani mationEffect> effect)

58 {	58 {

59 return animateInternal(element, effect, Timing());	59 return animateInternal(element, effect, Timing());

60 }	60 }

61	61

62 static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary)	62 static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, const Dictionary& timingInputDictionary, ExceptionStat e& exceptionState)

63 {	63 {

64 return animateInternal(element, EffectInput::convert(&element, keyframeD ictionaryVector), TimingInput::convert(timingInputDictionary));	64 return animateInternal(element, EffectInput::convert(&element, keyframeD ictionaryVector, exceptionState), TimingInput::convert(timingInputDictionary));

65 }	65 }

66	66

67 static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, double duration)	67 static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, double duration, ExceptionState& exceptionState)

68 {	68 {

69 return animateInternal(element, EffectInput::convert(&element, keyframeD ictionaryVector), TimingInput::convert(duration));	69 return animateInternal(element, EffectInput::convert(&element, keyframeD ictionaryVector, exceptionState), TimingInput::convert(duration));

70 }	70 }

71	71

72 static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector)	72 static AnimationPlayer* animate(Element& element, const Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionState)

73 {	73 {

74 return animateInternal(element, EffectInput::convert(&element, keyframeD ictionaryVector), Timing());	74 return animateInternal(element, EffectInput::convert(&element, keyframeD ictionaryVector, exceptionState), Timing());

75 }	75 }

76	76

77 private:	77 private:

78 static AnimationPlayer* animateInternal(Element& element, PassRefPtrWillBeRa wPtr<AnimationEffect> effect, const Timing& timing)	78 static AnimationPlayer* animateInternal(Element& element, PassRefPtrWillBeRa wPtr<AnimationEffect> effect, const Timing& timing)

79 {	79 {

80 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());	80 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled());

81 RefPtr<Animation> animation = Animation::create(&element, effect, timing );	81 RefPtr<Animation> animation = Animation::create(&element, effect, timing );

82 return element.document().timeline().play(animation.get());	82 return element.document().timeline().play(animation.get());

83 }	83 }

84 };	84 };

85	85

86 } // namespace WebCore	86 } // namespace WebCore

87	87

88 #endif // ElementAnimation_h	88 #endif // ElementAnimation_h

OLD	NEW