| 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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 599 KeyframeEffect* transition = KeyframeEffect::Create( | 599 KeyframeEffect* transition = KeyframeEffect::Create( |
| 600 element, model, inert_animation->SpecifiedTiming(), | 600 element, model, inert_animation->SpecifiedTiming(), |
| 601 KeyframeEffectReadOnly::kTransitionPriority, event_delegate); | 601 KeyframeEffectReadOnly::kTransitionPriority, event_delegate); |
| 602 Animation* animation = element->GetDocument().Timeline().Play(transition); | 602 Animation* animation = element->GetDocument().Timeline().Play(transition); |
| 603 if (property.IsCSSCustomProperty()) { | 603 if (property.IsCSSCustomProperty()) { |
| 604 animation->setId(property.CustomPropertyName()); | 604 animation->setId(property.CustomPropertyName()); |
| 605 } else { | 605 } else { |
| 606 animation->setId(getPropertyName(property.CssProperty())); | 606 animation->setId(getPropertyName(property.CssProperty())); |
| 607 } | 607 } |
| 608 // Set the current time as the start time for retargeted transitions | 608 // Set the current time as the start time for retargeted transitions |
| 609 if (retargeted_compositor_transitions.Contains(property)) | 609 if (retargeted_compositor_transitions.Contains(property)) { |
| 610 animation->setStartTime(element->GetDocument().Timeline().currentTime()); | 610 animation->setStartTime(element->GetDocument().Timeline().currentTime(), |
| 611 false); |
| 612 } |
| 611 animation->Update(kTimingUpdateOnDemand); | 613 animation->Update(kTimingUpdateOnDemand); |
| 612 running_transition.animation = animation; | 614 running_transition.animation = animation; |
| 613 transitions_.Set(property, running_transition); | 615 transitions_.Set(property, running_transition); |
| 614 DCHECK(isValidCSSPropertyID(property.CssProperty())); | 616 DCHECK(isValidCSSPropertyID(property.CssProperty())); |
| 615 UseCounter::CountAnimatedCSS(element->GetDocument(), | 617 UseCounter::CountAnimatedCSS(element->GetDocument(), |
| 616 property.CssProperty()); | 618 property.CssProperty()); |
| 617 | 619 |
| 618 // TODO(crbug.com/458925): Remove legacy histogram and counts | 620 // TODO(crbug.com/458925): Remove legacy histogram and counts |
| 619 DEFINE_STATIC_LOCAL(SparseHistogram, property_histogram, | 621 DEFINE_STATIC_LOCAL(SparseHistogram, property_histogram, |
| 620 ("WebCore.Animation.CSSProperties")); | 622 ("WebCore.Animation.CSSProperties")); |
| (...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1228 IsCustomPropertyHandle); | 1230 IsCustomPropertyHandle); |
| 1229 } | 1231 } |
| 1230 | 1232 |
| 1231 DEFINE_TRACE(CSSAnimations) { | 1233 DEFINE_TRACE(CSSAnimations) { |
| 1232 visitor->Trace(transitions_); | 1234 visitor->Trace(transitions_); |
| 1233 visitor->Trace(pending_update_); | 1235 visitor->Trace(pending_update_); |
| 1234 visitor->Trace(running_animations_); | 1236 visitor->Trace(running_animations_); |
| 1235 } | 1237 } |
| 1236 | 1238 |
| 1237 } // namespace blink | 1239 } // namespace blink |
| OLD | NEW |