diff options
author | loyso <loyso@chromium.org> | 2016-01-14 14:55:30 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-14 22:56:47 +0000 |
commit | e926437dd8e656f66cf83aec9823085cccf807e2 (patch) | |
tree | d53d305f0f4956468671a4723488c06d1d662687 /ui | |
parent | 2900f44f50bf81c8cef2118dbb0d719dae7ae927 (diff) | |
download | chromium_src-e926437dd8e656f66cf83aec9823085cccf807e2.zip chromium_src-e926437dd8e656f66cf83aec9823085cccf807e2.tar.gz chromium_src-e926437dd8e656f66cf83aec9823085cccf807e2.tar.bz2 |
CC Animation: Replace AnimiationEventsVector with AnimiationEvents class.
It allows us to use the forward declaration for AnimiationEvents.
This is a preparation to make AnimiationEvents an abstract class,
unknown for CC.
BUG=575053
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1584743002
Cr-Commit-Position: refs/heads/master@{#369591}
Diffstat (limited to 'ui')
-rw-r--r-- | ui/compositor/layer.h | 1 | ||||
-rw-r--r-- | ui/compositor/layer_animation_element.h | 1 | ||||
-rw-r--r-- | ui/compositor/layer_animation_sequence.cc | 1 | ||||
-rw-r--r-- | ui/compositor/layer_animation_sequence.h | 4 | ||||
-rw-r--r-- | ui/compositor/layer_animation_sequence_unittest.cc | 1 | ||||
-rw-r--r-- | ui/compositor/layer_animator.cc | 1 | ||||
-rw-r--r-- | ui/compositor/layer_animator_unittest.cc | 1 | ||||
-rw-r--r-- | ui/compositor/test/layer_animator_test_controller.cc | 1 |
8 files changed, 9 insertions, 2 deletions
diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h index 143a4e7..689cf39 100644 --- a/ui/compositor/layer.h +++ b/ui/compositor/layer.h @@ -15,7 +15,6 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" -#include "cc/animation/animation_events.h" #include "cc/base/region.h" #include "cc/layers/content_layer_client.h" #include "cc/layers/layer_client.h" diff --git a/ui/compositor/layer_animation_element.h b/ui/compositor/layer_animation_element.h index cf21d15..dc08f90 100644 --- a/ui/compositor/layer_animation_element.h +++ b/ui/compositor/layer_animation_element.h @@ -13,7 +13,6 @@ #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "cc/animation/animation.h" -#include "cc/animation/animation_events.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/compositor/compositor_export.h" #include "ui/gfx/animation/tween.h" diff --git a/ui/compositor/layer_animation_sequence.cc b/ui/compositor/layer_animation_sequence.cc index 04a91af..f71728d 100644 --- a/ui/compositor/layer_animation_sequence.cc +++ b/ui/compositor/layer_animation_sequence.cc @@ -8,6 +8,7 @@ #include <iterator> #include "base/trace_event/trace_event.h" +#include "cc/animation/animation_events.h" #include "cc/animation/animation_id_provider.h" #include "ui/compositor/layer_animation_delegate.h" #include "ui/compositor/layer_animation_element.h" diff --git a/ui/compositor/layer_animation_sequence.h b/ui/compositor/layer_animation_sequence.h index 898f65b..1cd1a9f 100644 --- a/ui/compositor/layer_animation_sequence.h +++ b/ui/compositor/layer_animation_sequence.h @@ -18,6 +18,10 @@ #include "ui/compositor/compositor_export.h" #include "ui/compositor/layer_animation_element.h" +namespace cc { +struct AnimationEvent; +} + namespace ui { class LayerAnimationDelegate; diff --git a/ui/compositor/layer_animation_sequence_unittest.cc b/ui/compositor/layer_animation_sequence_unittest.cc index e1bb123..708cc0a 100644 --- a/ui/compositor/layer_animation_sequence_unittest.cc +++ b/ui/compositor/layer_animation_sequence_unittest.cc @@ -7,6 +7,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" +#include "cc/animation/animation_events.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/compositor/layer_animation_delegate.h" #include "ui/compositor/layer_animation_element.h" diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc index 2e2d457..60a37f6 100644 --- a/ui/compositor/layer_animator.cc +++ b/ui/compositor/layer_animator.cc @@ -9,6 +9,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/trace_event/trace_event.h" +#include "cc/animation/animation_events.h" #include "cc/animation/animation_id_provider.h" #include "cc/animation/animation_player.h" #include "cc/animation/animation_timeline.h" diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc index 253b174..30f008b 100644 --- a/ui/compositor/layer_animator_unittest.cc +++ b/ui/compositor/layer_animator_unittest.cc @@ -9,6 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" +#include "cc/animation/animation_events.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/compositor/layer.h" #include "ui/compositor/layer_animation_delegate.h" diff --git a/ui/compositor/test/layer_animator_test_controller.cc b/ui/compositor/test/layer_animator_test_controller.cc index 9e07d05..37846ae 100644 --- a/ui/compositor/test/layer_animator_test_controller.cc +++ b/ui/compositor/test/layer_animator_test_controller.cc @@ -5,6 +5,7 @@ #include <stddef.h> #include "cc/animation/animation.h" +#include "cc/animation/animation_events.h" #include "ui/compositor/layer_animation_sequence.h" #include "ui/compositor/test/layer_animator_test_controller.h" #include "ui/gfx/geometry/rect.h" |