| 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 namespace blink { | 49 namespace blink { |
| 50 | 50 |
| 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 Document& document = toDocument(*executionContext); |
| 60 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectObjectTiming); | 60 UseCounter::count(document, UseCounter::AnimationConstructorKeyframeListEffe
ctObjectTiming); |
| 61 Timing timing; | 61 Timing timing; |
| 62 if (!TimingInput::convert(duration, timing, exceptionState)) | 62 if (!TimingInput::convert(duration, timing, exceptionState)) |
| 63 return nullptr; | 63 return nullptr; |
| 64 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), timing); | 64 return create(element, EffectInput::convert(document, effectInput, execution
Context, exceptionState), timing); |
| 65 } | 65 } |
| 66 | 66 |
| 67 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) |
| 68 { | 68 { |
| 69 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); | 69 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); |
| 70 if (element) | 70 Document& document = toDocument(*executionContext); |
| 71 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectObjectTiming); | 71 UseCounter::count(document, UseCounter::AnimationConstructorKeyframeListEffe
ctObjectTiming); |
| 72 Timing timing; | 72 Timing timing; |
| 73 Document* document = element ? &element->document() : nullptr; | |
| 74 if (!TimingInput::convert(timingInput, timing, document, exceptionState)) | 73 if (!TimingInput::convert(timingInput, timing, document, exceptionState)) |
| 75 return nullptr; | 74 return nullptr; |
| 76 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), timing); | 75 return create(element, EffectInput::convert(document, effectInput, execution
Context, exceptionState), timing); |
| 77 } | 76 } |
| 78 | 77 |
| 79 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, Exc
eptionState& exceptionState) | 78 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Eleme
nt* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, Exc
eptionState& exceptionState) |
| 80 { | 79 { |
| 81 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); | 80 ASSERT(RuntimeEnabledFeatures::webAnimationsAPIEnabled()); |
| 82 if (element) | 81 Document& document = toDocument(*executionContext); |
| 83 UseCounter::count(element->document(), UseCounter::AnimationConstructorK
eyframeListEffectNoTiming); | 82 UseCounter::count(document, UseCounter::AnimationConstructorKeyframeListEffe
ctNoTiming); |
| 84 return create(element, EffectInput::convert(element, effectInput, executionC
ontext, exceptionState), Timing()); | 83 return create(element, EffectInput::convert(document, effectInput, execution
Context, exceptionState), Timing()); |
| 85 } | 84 } |
| 86 | 85 |
| 87 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing
& timing, Priority priority, EventDelegate* eventDelegate) | 86 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing
& timing, Priority priority, EventDelegate* eventDelegate) |
| 88 : AnimationEffect(timing, eventDelegate) | 87 : AnimationEffect(timing, eventDelegate) |
| 89 , m_target(target) | 88 , m_target(target) |
| 90 , m_model(model) | 89 , m_model(model) |
| 91 , m_sampledEffect(nullptr) | 90 , m_sampledEffect(nullptr) |
| 92 , m_priority(priority) | 91 , m_priority(priority) |
| 93 { | 92 { |
| 94 } | 93 } |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 | 362 |
| 364 DEFINE_TRACE(KeyframeEffect) | 363 DEFINE_TRACE(KeyframeEffect) |
| 365 { | 364 { |
| 366 visitor->trace(m_target); | 365 visitor->trace(m_target); |
| 367 visitor->trace(m_model); | 366 visitor->trace(m_model); |
| 368 visitor->trace(m_sampledEffect); | 367 visitor->trace(m_sampledEffect); |
| 369 AnimationEffect::trace(visitor); | 368 AnimationEffect::trace(visitor); |
| 370 } | 369 } |
| 371 | 370 |
| 372 } // namespace blink | 371 } // namespace blink |
| OLD | NEW |