| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 KeyframeEffect* KeyframeEffect::create(Element* target, EffectModel* model, cons
t Timing& timing, Priority priority, EventDelegate* eventDelegate) | 51 KeyframeEffect* KeyframeEffect::create(Element* target, EffectModel* model, cons
t Timing& timing, Priority priority, EventDelegate* eventDelegate) |
| 52 { | 52 { |
| 53 return new KeyframeEffect(target, model, timing, priority, eventDelegate); | 53 return new KeyframeEffect(target, model, timing, priority, eventDelegate); |
| 54 } | 54 } |
| 55 | 55 |
| 56 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, dou
ble duration, ExceptionState& exceptionState) | 56 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, dou
ble duration, ExceptionState& exceptionState) |
| 57 { | 57 { |
| 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 Timing timing; |
| 62 bool success = TimingInput::convert(duration, timing); |
| 63 DCHECK(success); |
| 64 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), timing); |
| 62 } | 65 } |
| 66 |
| 63 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, con
st KeyframeEffectOptions& timingInput, ExceptionState& exceptionState) | 67 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, con
st KeyframeEffectOptions& timingInput, ExceptionState& exceptionState) |
| 64 { | 68 { |
| 65 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); | 69 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); |
| 66 if (element) | 70 if (element) |
| 67 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectObjectTiming); | 71 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectObjectTiming); |
| 68 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), TimingInput::convert(timingInput, &element->document())
); | 72 Timing timing; |
| 73 bool success = TimingInput::convert(timingInput, timing, &element->document(
), exceptionState); |
| 74 if (!success || exceptionState.hadException()) |
| 75 return nullptr; |
| 76 |
| 77 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), timing); |
| 69 } | 78 } |
| 79 |
| 70 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, Exc
eptionState& exceptionState) | 80 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, Exc
eptionState& exceptionState) |
| 71 { | 81 { |
| 72 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); | 82 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); |
| 73 if (element) | 83 if (element) |
| 74 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectNoTiming); | 84 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectNoTiming); |
| 75 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), Timing()); | 85 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), Timing()); |
| 76 } | 86 } |
| 77 | 87 |
| 78 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing
& timing, Priority priority, EventDelegate* eventDelegate) | 88 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing
& timing, Priority priority, EventDelegate* eventDelegate) |
| 79 : AnimationEffect(timing, eventDelegate) | 89 : AnimationEffect(timing, eventDelegate) |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 | 371 |
| 362 DEFINE_TRACE(KeyframeEffect) | 372 DEFINE_TRACE(KeyframeEffect) |
| 363 { | 373 { |
| 364 visitor->trace(m_target); | 374 visitor->trace(m_target); |
| 365 visitor->trace(m_model); | 375 visitor->trace(m_model); |
| 366 visitor->trace(m_sampledEffect); | 376 visitor->trace(m_sampledEffect); |
| 367 AnimationEffect::trace(visitor); | 377 AnimationEffect::trace(visitor); |
| 368 } | 378 } |
| 369 | 379 |
| 370 } // namespace blink | 380 } // namespace blink |
| OLD | NEW |