| 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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 toDeferredLegacyStyleInterpolation(toStyleInterpolation(interpol
ation)).underlyingStyleChanged(); | 335 toDeferredLegacyStyleInterpolation(toStyleInterpolation(interpol
ation)).underlyingStyleChanged(); |
| 336 }); | 336 }); |
| 337 | 337 |
| 338 bool updated = false; | 338 bool updated = false; |
| 339 if (styleUpdate.snapshot.opacity) | 339 if (styleUpdate.snapshot.opacity) |
| 340 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyOpacity, styleUpdate.snapshot.opacity); | 340 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyOpacity, styleUpdate.snapshot.opacity); |
| 341 if (styleUpdate.snapshot.transform) | 341 if (styleUpdate.snapshot.transform) |
| 342 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyTransform, styleUpdate.snapshot.transform); | 342 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyTransform, styleUpdate.snapshot.transform); |
| 343 if (styleUpdate.snapshot.webkitFilter) | 343 if (styleUpdate.snapshot.webkitFilter) |
| 344 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyWebkitFilter, styleUpdate.snapshot.webkitFilter); | 344 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyWebkitFilter, styleUpdate.snapshot.webkitFilter); |
| 345 if (styleUpdate.snapshot.backdropFilter) |
| 346 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyBackdropFilter, styleUpdate.snapshot.backdropFilter); |
| 345 if (updated) { | 347 if (updated) { |
| 346 styleUpdate.animation->setOutdated(); | 348 styleUpdate.animation->setOutdated(); |
| 347 styleUpdate.animation->setCompositorPending(true); | 349 styleUpdate.animation->setCompositorPending(true); |
| 348 } | 350 } |
| 349 } | 351 } |
| 350 | 352 |
| 351 for (const auto& entry : update->animationsWithUpdates()) { | 353 for (const auto& entry : update->animationsWithUpdates()) { |
| 352 KeyframeEffect* effect = toKeyframeEffect(entry.animation->effect()); | 354 KeyframeEffect* effect = toKeyframeEffect(entry.animation->effect()); |
| 353 | 355 |
| 354 effect->setModel(entry.effect->model()); | 356 effect->setModel(entry.effect->model()); |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 807 visitor->trace(m_activeInterpolationsForAnimations); | 809 visitor->trace(m_activeInterpolationsForAnimations); |
| 808 visitor->trace(m_activeInterpolationsForTransitions); | 810 visitor->trace(m_activeInterpolationsForTransitions); |
| 809 visitor->trace(m_newAnimations); | 811 visitor->trace(m_newAnimations); |
| 810 visitor->trace(m_suppressedAnimations); | 812 visitor->trace(m_suppressedAnimations); |
| 811 visitor->trace(m_animationsWithUpdates); | 813 visitor->trace(m_animationsWithUpdates); |
| 812 visitor->trace(m_animationsWithStyleUpdates); | 814 visitor->trace(m_animationsWithStyleUpdates); |
| 813 #endif | 815 #endif |
| 814 } | 816 } |
| 815 | 817 |
| 816 } // namespace blink | 818 } // namespace blink |
| OLD | NEW |