| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); | 58 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); |
| 59 if (element) | 59 if (element) |
| 60 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectObjectTiming); | 60 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectObjectTiming); |
| 61 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), TimingInput::convert(duration)); | 61 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), TimingInput::convert(duration)); |
| 62 } | 62 } |
| 63 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, con
st KeyframeEffectOptions& timingInput, ExceptionState& exceptionState) | 63 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, con
st KeyframeEffectOptions& timingInput, ExceptionState& exceptionState) |
| 64 { | 64 { |
| 65 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); | 65 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); |
| 66 if (element) | 66 if (element) |
| 67 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectObjectTiming); | 67 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectObjectTiming); |
| 68 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), TimingInput::convert(timingInput)); | 68 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), TimingInput::convert(timingInput, &element->document())
); |
| 69 } | 69 } |
| 70 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, Exc
eptionState& exceptionState) | 70 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, Exc
eptionState& exceptionState) |
| 71 { | 71 { |
| 72 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); | 72 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); |
| 73 if (element) | 73 if (element) |
| 74 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectNoTiming); | 74 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectNoTiming); |
| 75 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), Timing()); | 75 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), Timing()); |
| 76 } | 76 } |
| 77 | 77 |
| 78 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing
& timing, Priority priority, EventDelegate* eventDelegate) | 78 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing
& timing, Priority priority, EventDelegate* eventDelegate) |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 | 361 |
| 362 DEFINE_TRACE(KeyframeEffect) | 362 DEFINE_TRACE(KeyframeEffect) |
| 363 { | 363 { |
| 364 visitor->trace(m_target); | 364 visitor->trace(m_target); |
| 365 visitor->trace(m_model); | 365 visitor->trace(m_model); |
| 366 visitor->trace(m_sampledEffect); | 366 visitor->trace(m_sampledEffect); |
| 367 AnimationEffect::trace(visitor); | 367 AnimationEffect::trace(visitor); |
| 368 } | 368 } |
| 369 | 369 |
| 370 } // namespace blink | 370 } // namespace blink |
| OLD | NEW |