| 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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 } | 573 } |
| 574 } | 574 } |
| 575 } | 575 } |
| 576 } | 576 } |
| 577 | 577 |
| 578 if (activeTransitions) { | 578 if (activeTransitions) { |
| 579 for (TransitionMap::const_iterator iter = activeTransitions->begin(); it
er != activeTransitions->end(); ++iter) { | 579 for (TransitionMap::const_iterator iter = activeTransitions->begin(); it
er != activeTransitions->end(); ++iter) { |
| 580 const TimedItem* timedItem = iter->value.player->source(); | 580 const TimedItem* timedItem = iter->value.player->source(); |
| 581 CSSPropertyID id = iter->key; | 581 CSSPropertyID id = iter->key; |
| 582 if (timedItem->phase() == TimedItem::PhaseAfter || (!anyTransitionHa
dAnimateAll && !animationStyleRecalc && !listedProperties.get(id))) { | 582 if (timedItem->phase() == TimedItem::PhaseAfter || (!anyTransitionHa
dAnimateAll && !animationStyleRecalc && !listedProperties.get(id))) { |
| 583 ASSERT(timedItem->phase() == TimedItem::PhaseAfter || !(activeAn
imations && activeAnimations->isAnimationStyleChange())); | 583 // TODO: Figure out why this fails on Chrome OS login page. crbu
g.com/365507 |
| 584 // ASSERT(timedItem->phase() == TimedItem::PhaseAfter || !(activ
eAnimations && activeAnimations->isAnimationStyleChange())); |
| 584 update->cancelTransition(id); | 585 update->cancelTransition(id); |
| 585 } | 586 } |
| 586 } | 587 } |
| 587 } | 588 } |
| 588 } | 589 } |
| 589 | 590 |
| 590 void CSSAnimations::cancel() | 591 void CSSAnimations::cancel() |
| 591 { | 592 { |
| 592 for (AnimationMap::iterator iter = m_animations.begin(); iter != m_animation
s.end(); ++iter) | 593 for (AnimationMap::iterator iter = m_animations.begin(); iter != m_animation
s.end(); ++iter) |
| 593 iter->value->cancel(); | 594 iter->value->cancel(); |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 850 } | 851 } |
| 851 | 852 |
| 852 void CSSAnimationUpdate::trace(Visitor* visitor) | 853 void CSSAnimationUpdate::trace(Visitor* visitor) |
| 853 { | 854 { |
| 854 visitor->trace(m_newTransitions); | 855 visitor->trace(m_newTransitions); |
| 855 visitor->trace(m_activeInterpolationsForAnimations); | 856 visitor->trace(m_activeInterpolationsForAnimations); |
| 856 visitor->trace(m_activeInterpolationsForTransitions); | 857 visitor->trace(m_activeInterpolationsForTransitions); |
| 857 } | 858 } |
| 858 | 859 |
| 859 } // namespace WebCore | 860 } // namespace WebCore |
| OLD | NEW |