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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 return create(element, EffectInput::convert(element, keyframeDictionaryVecto
r, exceptionState), Timing()); | 76 return create(element, EffectInput::convert(element, keyframeDictionaryVecto
r, exceptionState), Timing()); |
77 } | 77 } |
78 | 78 |
79 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing
& timing, Priority priority, EventDelegate* eventDelegate) | 79 KeyframeEffect::KeyframeEffect(Element* target, EffectModel* model, const Timing
& timing, Priority priority, EventDelegate* eventDelegate) |
80 : AnimationEffect(timing, eventDelegate) | 80 : AnimationEffect(timing, eventDelegate) |
81 , m_target(target) | 81 , m_target(target) |
82 , m_model(model) | 82 , m_model(model) |
83 , m_sampledEffect(nullptr) | 83 , m_sampledEffect(nullptr) |
84 , m_priority(priority) | 84 , m_priority(priority) |
85 { | 85 { |
| 86 #if !ENABLE(OILPAN) |
| 87 if (m_target) |
| 88 m_target->ensureElementAnimations().addEffect(this); |
| 89 #endif |
86 } | 90 } |
87 | 91 |
88 KeyframeEffect::~KeyframeEffect() | 92 KeyframeEffect::~KeyframeEffect() |
89 { | 93 { |
90 } | 94 } |
91 | 95 |
92 void KeyframeEffect::attach(Animation* animation) | 96 void KeyframeEffect::attach(Animation* animation) |
93 { | 97 { |
94 if (m_target) { | 98 if (m_target) { |
95 m_target->ensureElementAnimations().animations().add(animation); | 99 m_target->ensureElementAnimations().animations().add(animation); |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 | 365 |
362 DEFINE_TRACE(KeyframeEffect) | 366 DEFINE_TRACE(KeyframeEffect) |
363 { | 367 { |
364 visitor->trace(m_target); | 368 visitor->trace(m_target); |
365 visitor->trace(m_model); | 369 visitor->trace(m_model); |
366 visitor->trace(m_sampledEffect); | 370 visitor->trace(m_sampledEffect); |
367 AnimationEffect::trace(visitor); | 371 AnimationEffect::trace(visitor); |
368 } | 372 } |
369 | 373 |
370 } // namespace blink | 374 } // namespace blink |
OLD | NEW |