| 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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 toDeferredLegacyStyleInterpolation(toStyleInterpolation(interpol
ation)).underlyingStyleChanged(); | 330 toDeferredLegacyStyleInterpolation(toStyleInterpolation(interpol
ation)).underlyingStyleChanged(); |
| 331 }); | 331 }); |
| 332 | 332 |
| 333 bool updated = false; | 333 bool updated = false; |
| 334 if (styleUpdate.snapshot.opacity) | 334 if (styleUpdate.snapshot.opacity) |
| 335 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyOpacity, styleUpdate.snapshot.opacity); | 335 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyOpacity, styleUpdate.snapshot.opacity); |
| 336 if (styleUpdate.snapshot.transform) | 336 if (styleUpdate.snapshot.transform) |
| 337 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyTransform, styleUpdate.snapshot.transform); | 337 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyTransform, styleUpdate.snapshot.transform); |
| 338 if (styleUpdate.snapshot.webkitFilter) | 338 if (styleUpdate.snapshot.webkitFilter) |
| 339 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyWebkitFilter, styleUpdate.snapshot.webkitFilter); | 339 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyWebkitFilter, styleUpdate.snapshot.webkitFilter); |
| 340 if (styleUpdate.snapshot.backdropFilter) |
| 341 updated |= styleUpdate.model->updateNeutralKeyframeAnimatableValues(
CSSPropertyBackdropFilter, styleUpdate.snapshot.backdropFilter); |
| 340 if (updated) { | 342 if (updated) { |
| 341 styleUpdate.animation->setOutdated(); | 343 styleUpdate.animation->setOutdated(); |
| 342 styleUpdate.animation->setCompositorPending(true); | 344 styleUpdate.animation->setCompositorPending(true); |
| 343 } | 345 } |
| 344 } | 346 } |
| 345 | 347 |
| 346 for (const auto& entry : m_pendingUpdate.animationsWithUpdates()) { | 348 for (const auto& entry : m_pendingUpdate.animationsWithUpdates()) { |
| 347 KeyframeEffect* effect = toKeyframeEffect(entry.animation->effect()); | 349 KeyframeEffect* effect = toKeyframeEffect(entry.animation->effect()); |
| 348 | 350 |
| 349 effect->setModel(entry.effect->model()); | 351 effect->setModel(entry.effect->model()); |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 791 { | 793 { |
| 792 #if ENABLE(OILPAN) | 794 #if ENABLE(OILPAN) |
| 793 visitor->trace(m_transitions); | 795 visitor->trace(m_transitions); |
| 794 visitor->trace(m_pendingUpdate); | 796 visitor->trace(m_pendingUpdate); |
| 795 visitor->trace(m_animations); | 797 visitor->trace(m_animations); |
| 796 visitor->trace(m_previousActiveInterpolationsForAnimations); | 798 visitor->trace(m_previousActiveInterpolationsForAnimations); |
| 797 #endif | 799 #endif |
| 798 } | 800 } |
| 799 | 801 |
| 800 } // namespace blink | 802 } // namespace blink |
| OLD | NEW |