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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 1698813002: CC Animation: Expose TargetProperty enum to be aliased in Blink Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use custom hash in unordered_set. 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
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 8c8c20512c40a8aeb2aa70f68f215c99fe8c06d9..4787eec4d97c1f2e015f1586ca8b55ab48ead685 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -3643,7 +3643,7 @@ void LayerTreeHostImpl::ScrollAnimationAbort(LayerImpl* layer_impl) {
return animation_host_->ScrollAnimationAbort();
layer_impl->layer_animation_controller()->AbortAnimations(
- Animation::SCROLL_OFFSET);
+ AnimationTargetProperty::SCROLL_OFFSET);
}
void LayerTreeHostImpl::ScrollAnimationCreate(
@@ -3662,7 +3662,8 @@ void LayerTreeHostImpl::ScrollAnimationCreate(
scoped_ptr<Animation> animation = Animation::Create(
std::move(curve), AnimationIdProvider::NextAnimationId(),
- AnimationIdProvider::NextGroupId(), Animation::SCROLL_OFFSET);
+ AnimationIdProvider::NextGroupId(),
+ AnimationTargetProperty::SCROLL_OFFSET);
animation->set_is_impl_only(true);
layer_impl->layer_animation_controller()->AddAnimation(std::move(animation));
@@ -3679,7 +3680,7 @@ bool LayerTreeHostImpl::ScrollAnimationUpdateTarget(
Animation* animation =
layer_impl->layer_animation_controller()
? layer_impl->layer_animation_controller()->GetAnimation(
- Animation::SCROLL_OFFSET)
+ AnimationTargetProperty::SCROLL_OFFSET)
: nullptr;
if (!animation)
return false;

Powered by Google App Engine
This is Rietveld 408576698