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 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
772 | 772 |
773 RefPtr<TransitionKeyframe> end_keyframe = | 773 RefPtr<TransitionKeyframe> end_keyframe = |
774 TransitionKeyframe::Create(property); | 774 TransitionKeyframe::Create(property); |
775 end_keyframe->SetValue(TypedInterpolationValue::Create( | 775 end_keyframe->SetValue(TypedInterpolationValue::Create( |
776 *transition_type, end.interpolable_value->Clone(), | 776 *transition_type, end.interpolable_value->Clone(), |
777 end.non_interpolable_value)); | 777 end.non_interpolable_value)); |
778 end_keyframe->SetOffset(1); | 778 end_keyframe->SetOffset(1); |
779 keyframes.push_back(end_keyframe); | 779 keyframes.push_back(end_keyframe); |
780 | 780 |
781 if (CompositorAnimations::IsCompositableProperty(property.CssProperty())) { | 781 if (CompositorAnimations::IsCompositableProperty(property.CssProperty())) { |
782 RefPtr<AnimatableValue> from = | 782 RefPtr<AnimatableValue> from = CSSAnimatableValueFactory::Create( |
783 CSSAnimatableValueFactory::Create(property, state.old_style); | 783 property.CssProperty(), state.old_style); |
784 RefPtr<AnimatableValue> to = | 784 RefPtr<AnimatableValue> to = |
785 CSSAnimatableValueFactory::Create(property, state.style); | 785 CSSAnimatableValueFactory::Create(property.CssProperty(), state.style); |
786 delay_keyframe->SetCompositorValue(from); | 786 delay_keyframe->SetCompositorValue(from); |
787 start_keyframe->SetCompositorValue(from); | 787 start_keyframe->SetCompositorValue(from); |
788 end_keyframe->SetCompositorValue(to); | 788 end_keyframe->SetCompositorValue(to); |
789 } | 789 } |
790 | 790 |
791 TransitionKeyframeEffectModel* model = | 791 TransitionKeyframeEffectModel* model = |
792 TransitionKeyframeEffectModel::Create(keyframes); | 792 TransitionKeyframeEffectModel::Create(keyframes); |
793 if (!state.cloned_style) { | 793 if (!state.cloned_style) { |
794 state.cloned_style = ComputedStyle::Clone(state.style); | 794 state.cloned_style = ComputedStyle::Clone(state.style); |
795 } | 795 } |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1230 IsCustomPropertyHandle); | 1230 IsCustomPropertyHandle); |
1231 } | 1231 } |
1232 | 1232 |
1233 DEFINE_TRACE(CSSAnimations) { | 1233 DEFINE_TRACE(CSSAnimations) { |
1234 visitor->Trace(transitions_); | 1234 visitor->Trace(transitions_); |
1235 visitor->Trace(pending_update_); | 1235 visitor->Trace(pending_update_); |
1236 visitor->Trace(running_animations_); | 1236 visitor->Trace(running_animations_); |
1237 } | 1237 } |
1238 | 1238 |
1239 } // namespace blink | 1239 } // namespace blink |
OLD | NEW |