Commit 6a9a4587 authored by Yi Gu's avatar Yi Gu Committed by Commit Bot

Make cc::AnimationTarget abstract

Currently cc::AnimationTarget is implemented by cc::ElementAnimation,
vr::UiElement and vr::TestAnimationTarget. Make it abstract for better
readability.

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:linux_vr;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Ic46040c4f703de76058beec68789da810a8ac53c
Reviewed-on: https://chromium-review.googlesource.com/1131228Reviewed-by: default avatarIan Vollick <vollick@chromium.org>
Commit-Queue: Yi Gu <yigu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580366}
parent db560919
......@@ -27,24 +27,24 @@ class CC_ANIMATION_EXPORT AnimationTarget {
virtual ~AnimationTarget() {}
virtual void NotifyClientFloatAnimated(float opacity,
int target_property_id,
KeyframeModel* keyframe_model) {}
KeyframeModel* keyframe_model) = 0;
virtual void NotifyClientFilterAnimated(const FilterOperations& filter,
int target_property_id,
KeyframeModel* keyframe_model) {}
KeyframeModel* keyframe_model) = 0;
virtual void NotifyClientSizeAnimated(const gfx::SizeF& size,
int target_property_id,
KeyframeModel* keyframe_model) {}
KeyframeModel* keyframe_model) = 0;
virtual void NotifyClientColorAnimated(SkColor color,
int target_property_id,
KeyframeModel* keyframe_model) {}
KeyframeModel* keyframe_model) = 0;
virtual void NotifyClientTransformOperationsAnimated(
const TransformOperations& operations,
int target_property_id,
KeyframeModel* keyframe_model) {}
KeyframeModel* keyframe_model) = 0;
virtual void NotifyClientScrollOffsetAnimated(
const gfx::ScrollOffset& scroll_offset,
int target_property_id,
KeyframeModel* keyframe_model) {}
KeyframeModel* keyframe_model) = 0;
};
} // namespace cc
......
......@@ -148,6 +148,12 @@ class CC_ANIMATION_EXPORT ElementAnimations
void NotifyClientFilterAnimated(const FilterOperations& filter,
int target_property_id,
KeyframeModel* keyframe_model) override;
void NotifyClientSizeAnimated(const gfx::SizeF& size,
int target_property_id,
KeyframeModel* keyframe_model) override{};
void NotifyClientColorAnimated(SkColor color,
int target_property_id,
KeyframeModel* keyframe_model) override{};
void NotifyClientTransformOperationsAnimated(
const TransformOperations& operations,
int target_property_id,
......
......@@ -63,6 +63,13 @@ class TestAnimationTarget : public cc::AnimationTarget {
cc::KeyframeModel* keyframe_model) override {
background_color_ = color;
}
void NotifyClientFilterAnimated(const cc::FilterOperations& filter,
int target_property_id,
cc::KeyframeModel* keyframe_model) override {}
void NotifyClientScrollOffsetAnimated(
const gfx::ScrollOffset& scroll_offset,
int target_property_id,
cc::KeyframeModel* keyframe_model) override {}
private:
cc::TransformOperations layout_offset_;
......
......@@ -401,6 +401,16 @@ class VR_UI_EXPORT UiElement : public cc::AnimationTarget {
void NotifyClientSizeAnimated(const gfx::SizeF& size,
int target_property_id,
cc::KeyframeModel* keyframe_model) override;
void NotifyClientFilterAnimated(const cc::FilterOperations& filter,
int target_property_id,
cc::KeyframeModel* keyframe_model) override {}
void NotifyClientColorAnimated(SkColor color,
int target_property_id,
cc::KeyframeModel* keyframe_model) override {}
void NotifyClientScrollOffsetAnimated(
const gfx::ScrollOffset& scroll_offset,
int target_property_id,
cc::KeyframeModel* keyframe_model) override {}
void SetTransitionedProperties(const std::set<TargetProperty>& properties);
void SetTransitionDuration(base::TimeDelta delta);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment