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 14 matching lines...) Expand all Loading... |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "core/animation/EffectInput.h" | 32 #include "core/animation/EffectInput.h" |
33 | 33 |
34 #include "bindings/core/v8/Dictionary.h" | 34 #include "bindings/core/v8/Dictionary.h" |
| 35 #include "bindings/core/v8/UnionTypesCore.h" |
35 #include "core/animation/AnimationInputHelpers.h" | 36 #include "core/animation/AnimationInputHelpers.h" |
36 #include "core/animation/KeyframeEffectModel.h" | 37 #include "core/animation/KeyframeEffectModel.h" |
37 #include "core/animation/StringKeyframe.h" | 38 #include "core/animation/StringKeyframe.h" |
38 #include "core/css/resolver/StyleResolver.h" | 39 #include "core/css/resolver/StyleResolver.h" |
39 #include "core/dom/Document.h" | 40 #include "core/dom/Document.h" |
40 #include "core/dom/Element.h" | 41 #include "core/dom/Element.h" |
41 #include "wtf/NonCopyingSort.h" | 42 #include "wtf/NonCopyingSort.h" |
42 | 43 |
43 namespace blink { | 44 namespace blink { |
44 | 45 |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
113 } | 114 } |
114 if (!keyframeEffectModel->isReplaceOnly()) { | 115 if (!keyframeEffectModel->isReplaceOnly()) { |
115 exceptionState.throwDOMException(NotSupportedError, "Additive animations
are not supported."); | 116 exceptionState.throwDOMException(NotSupportedError, "Additive animations
are not supported."); |
116 return nullptr; | 117 return nullptr; |
117 } | 118 } |
118 keyframeEffectModel->forceConversionsToAnimatableValues(element); | 119 keyframeEffectModel->forceConversionsToAnimatableValues(element); |
119 | 120 |
120 return keyframeEffectModel; | 121 return keyframeEffectModel; |
121 } | 122 } |
122 | 123 |
| 124 PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c
onst AnimationEffectOrDictionarySequence& effectInput, ExceptionState& exception
State) |
| 125 { |
| 126 if (effectInput.isAnimationEffect()) |
| 127 return effectInput.getAsAnimationEffect(); |
| 128 if (effectInput.isDictionarySequence()) |
| 129 return convert(element, effectInput.getAsDictionarySequence(), exception
State); |
| 130 return nullptr; |
| 131 } |
| 132 |
123 } // namespace blink | 133 } // namespace blink |
OLD | NEW |