| 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 13 matching lines...) Expand all Loading... |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 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 "core/animation/EffectInput.h" | 31 #include "core/animation/EffectInput.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/Dictionary.h" | 33 #include "bindings/core/v8/Dictionary.h" |
| 34 #include "bindings/core/v8/EffectModelOrDictionarySequenceOrDictionary.h" | 34 #include "bindings/core/v8/DictionarySequenceOrDictionary.h" |
| 35 #include "core/animation/AnimationInputHelpers.h" | 35 #include "core/animation/AnimationInputHelpers.h" |
| 36 #include "core/animation/CompositorAnimations.h" | 36 #include "core/animation/CompositorAnimations.h" |
| 37 #include "core/animation/KeyframeEffectModel.h" | 37 #include "core/animation/KeyframeEffectModel.h" |
| 38 #include "core/animation/StringKeyframe.h" | 38 #include "core/animation/StringKeyframe.h" |
| 39 #include "core/css/CSSStyleSheet.h" | 39 #include "core/css/CSSStyleSheet.h" |
| 40 #include "core/dom/Document.h" | 40 #include "core/dom/Document.h" |
| 41 #include "core/dom/Element.h" | 41 #include "core/dom/Element.h" |
| 42 #include "core/dom/ExceptionCode.h" | 42 #include "core/dom/ExceptionCode.h" |
| 43 #include "core/dom/NodeComputedStyle.h" | 43 #include "core/dom/NodeComputedStyle.h" |
| 44 #include "wtf/ASCIICType.h" | 44 #include "wtf/ASCIICType.h" |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 return false; | 131 return false; |
| 132 } | 132 } |
| 133 result.append(dictionary); | 133 result.append(dictionary); |
| 134 } | 134 } |
| 135 return !exceptionState.hadException(); | 135 return !exceptionState.hadException(); |
| 136 } | 136 } |
| 137 | 137 |
| 138 } // namespace | 138 } // namespace |
| 139 | 139 |
| 140 // Spec: http://w3c.github.io/web-animations/#processing-a-frames-argument | 140 // Spec: http://w3c.github.io/web-animations/#processing-a-frames-argument |
| 141 EffectModel* EffectInput::convert(Element* element, const EffectModelOrDictionar
ySequenceOrDictionary& effectInput, ExecutionContext* executionContext, Exceptio
nState& exceptionState) | 141 EffectModel* EffectInput::convert(Element* element, const DictionarySequenceOrDi
ctionary& effectInput, ExecutionContext* executionContext, ExceptionState& excep
tionState) |
| 142 { | 142 { |
| 143 if (effectInput.isEffectModel()) | |
| 144 return effectInput.getAsEffectModel(); | |
| 145 | |
| 146 if (effectInput.isNull() || !element) | 143 if (effectInput.isNull() || !element) |
| 147 return nullptr; | 144 return nullptr; |
| 148 | 145 |
| 149 if (effectInput.isDictionarySequence()) | 146 if (effectInput.isDictionarySequence()) |
| 150 return convertArrayForm(*element, effectInput.getAsDictionarySequence(),
exceptionState); | 147 return convertArrayForm(*element, effectInput.getAsDictionarySequence(),
exceptionState); |
| 151 | 148 |
| 152 const Dictionary& dictionary = effectInput.getAsDictionary(); | 149 const Dictionary& dictionary = effectInput.getAsDictionary(); |
| 153 DictionaryIterator iterator = dictionary.getIterator(executionContext); | 150 DictionaryIterator iterator = dictionary.getIterator(executionContext); |
| 154 if (!iterator.isNull()) { | 151 if (!iterator.isNull()) { |
| 155 // TODO(alancutter): Convert keyframes during iteration rather than afte
r to match spec. | 152 // TODO(alancutter): Convert keyframes during iteration rather than afte
r to match spec. |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 } | 282 } |
| 286 | 283 |
| 287 std::sort(keyframes.begin(), keyframes.end(), compareKeyframes); | 284 std::sort(keyframes.begin(), keyframes.end(), compareKeyframes); |
| 288 | 285 |
| 289 ASSERT(!exceptionState.hadException()); | 286 ASSERT(!exceptionState.hadException()); |
| 290 | 287 |
| 291 return createEffectModelFromKeyframes(element, keyframes, exceptionState); | 288 return createEffectModelFromKeyframes(element, keyframes, exceptionState); |
| 292 } | 289 } |
| 293 | 290 |
| 294 } // namespace blink | 291 } // namespace blink |
| OLD | NEW |