Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Side by Side Diff: third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp

Issue 2811253003: Make InterpolationEnvironment virutal (Closed)
Patch Set: protected Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 671 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 property.CssProperty(), state.old_style, state.style)) { 682 property.CssProperty(), state.old_style, state.style)) {
683 return; 683 return;
684 } 684 }
685 685
686 if (!to) 686 if (!to)
687 to = CSSAnimatableValueFactory::Create(property, state.style); 687 to = CSSAnimatableValueFactory::Create(property, state.style);
688 RefPtr<AnimatableValue> from = 688 RefPtr<AnimatableValue> from =
689 CSSAnimatableValueFactory::Create(property, state.old_style); 689 CSSAnimatableValueFactory::Create(property, state.old_style);
690 690
691 CSSInterpolationTypesMap map(registry); 691 CSSInterpolationTypesMap map(registry);
692 InterpolationEnvironment old_environment(map, state.old_style); 692 CSSInterpolationEnvironment old_environment(map, state.old_style);
693 InterpolationEnvironment new_environment(map, state.style); 693 CSSInterpolationEnvironment new_environment(map, state.style);
694 InterpolationValue start = nullptr; 694 InterpolationValue start = nullptr;
695 InterpolationValue end = nullptr; 695 InterpolationValue end = nullptr;
696 const InterpolationType* transition_type = nullptr; 696 const InterpolationType* transition_type = nullptr;
697 for (const auto& interpolation_type : map.Get(property)) { 697 for (const auto& interpolation_type : map.Get(property)) {
698 start = interpolation_type->MaybeConvertUnderlyingValue(old_environment); 698 start = interpolation_type->MaybeConvertUnderlyingValue(old_environment);
699 if (!start) { 699 if (!start) {
700 continue; 700 continue;
701 } 701 }
702 end = interpolation_type->MaybeConvertUnderlyingValue(new_environment); 702 end = interpolation_type->MaybeConvertUnderlyingValue(new_environment);
703 if (!end) { 703 if (!end) {
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698