| 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 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 448 CSSPropertyID eventId = id; | 448 CSSPropertyID eventId = id; |
| 449 | 449 |
| 450 if (!animateAll) { | 450 if (!animateAll) { |
| 451 id = propertyForAnimation(id); | 451 id = propertyForAnimation(id); |
| 452 if (CSSPropertyMetadata::isAnimatableProperty(id)) | 452 if (CSSPropertyMetadata::isAnimatableProperty(id)) |
| 453 listedProperties.set(id); | 453 listedProperties.set(id); |
| 454 else | 454 else |
| 455 continue; | 455 continue; |
| 456 } | 456 } |
| 457 | 457 |
| 458 // FIXME: We should transition if an !important property changes
even when an animation is running, | |
| 459 // but this is a bit hard to do with the current applyMatchedPro
perties system. | |
| 460 if (!update->activeInterpolationsForAnimations().contains(id) | 458 if (!update->activeInterpolationsForAnimations().contains(id) |
| 461 && (!activeAnimations || !activeAnimations->cssAnimations().
m_previousActiveInterpolationsForAnimations.contains(id))) { | 459 && (!activeAnimations || !activeAnimations->cssAnimations().
m_previousActiveInterpolationsForAnimations.contains(id))) { |
| 462 calculateTransitionUpdateForProperty(id, eventId, *transitio
nData, i, oldStyle, style, activeTransitions, update, element); | 460 calculateTransitionUpdateForProperty(id, eventId, *transitio
nData, i, oldStyle, style, activeTransitions, update, element); |
| 463 } | 461 } |
| 464 } | 462 } |
| 465 } | 463 } |
| 466 } | 464 } |
| 467 | 465 |
| 468 if (activeTransitions) { | 466 if (activeTransitions) { |
| 469 for (TransitionMap::const_iterator iter = activeTransitions->begin(); it
er != activeTransitions->end(); ++iter) { | 467 for (TransitionMap::const_iterator iter = activeTransitions->begin(); it
er != activeTransitions->end(); ++iter) { |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 639 case CSSPropertyTransitionDuration: | 637 case CSSPropertyTransitionDuration: |
| 640 case CSSPropertyTransitionProperty: | 638 case CSSPropertyTransitionProperty: |
| 641 case CSSPropertyTransitionTimingFunction: | 639 case CSSPropertyTransitionTimingFunction: |
| 642 return false; | 640 return false; |
| 643 default: | 641 default: |
| 644 return true; | 642 return true; |
| 645 } | 643 } |
| 646 } | 644 } |
| 647 | 645 |
| 648 } // namespace blink | 646 } // namespace blink |
| OLD | NEW |