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

Unified Diff: ui/compositor/layer_animation_element.cc

Issue 1700653002: CC Animation: Expose TargetProperty enum to be aliased in Blink Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/compositor/layer_animation_element.h ('k') | ui/compositor/layer_animation_sequence_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/layer_animation_element.cc
diff --git a/ui/compositor/layer_animation_element.cc b/ui/compositor/layer_animation_element.cc
index 29aa7fa782e0149626e92395fd490a53d1b15a5e..edf5bdc89fdd0b80e39b107bb762ffbe0bcb9c87 100644
--- a/ui/compositor/layer_animation_element.cc
+++ b/ui/compositor/layer_animation_element.cc
@@ -423,9 +423,9 @@ class ThreadedOpacityTransition : public ThreadedLayerAnimationElement {
start_,
target_,
duration()));
- scoped_ptr<cc::Animation> animation(
- cc::Animation::Create(std::move(animation_curve), animation_id(),
- animation_group_id(), cc::Animation::OPACITY));
+ scoped_ptr<cc::Animation> animation(cc::Animation::Create(
+ std::move(animation_curve), animation_id(), animation_group_id(),
+ cc::TargetProperty::OPACITY));
return animation;
}
@@ -476,9 +476,9 @@ class ThreadedTransformTransition : public ThreadedLayerAnimationElement {
start_,
target_,
duration()));
- scoped_ptr<cc::Animation> animation(
- cc::Animation::Create(std::move(animation_curve), animation_id(),
- animation_group_id(), cc::Animation::TRANSFORM));
+ scoped_ptr<cc::Animation> animation(cc::Animation::Create(
+ std::move(animation_curve), animation_id(), animation_group_id(),
+ cc::TargetProperty::TRANSFORM));
return animation;
}
@@ -548,9 +548,9 @@ class InverseTransformTransition : public ThreadedLayerAnimationElement {
}
scoped_ptr<cc::Animation> CreateCCAnimation() override {
- scoped_ptr<cc::Animation> animation(
- cc::Animation::Create(animation_curve_->Clone(), animation_id(),
- animation_group_id(), cc::Animation::TRANSFORM));
+ scoped_ptr<cc::Animation> animation(cc::Animation::Create(
+ animation_curve_->Clone(), animation_id(), animation_group_id(),
+ cc::TargetProperty::TRANSFORM));
return animation;
}
@@ -742,12 +742,11 @@ void LayerAnimationElement::RequestEffectiveStart(
// static
LayerAnimationElement::AnimatableProperty
-LayerAnimationElement::ToAnimatableProperty(
- cc::Animation::TargetProperty property) {
+LayerAnimationElement::ToAnimatableProperty(cc::TargetProperty::Type property) {
switch (property) {
- case cc::Animation::TRANSFORM:
+ case cc::TargetProperty::TRANSFORM:
return TRANSFORM;
- case cc::Animation::OPACITY:
+ case cc::TargetProperty::OPACITY:
return OPACITY;
default:
NOTREACHED();
« no previous file with comments | « ui/compositor/layer_animation_element.h ('k') | ui/compositor/layer_animation_sequence_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698