| Index: content/test/web_layer_tree_view_impl_for_testing.cc
|
| diff --git a/content/test/web_layer_tree_view_impl_for_testing.cc b/content/test/web_layer_tree_view_impl_for_testing.cc
|
| index 7dbc162085fc94c782a50cd9414857edbe4baf3d..6d5a0c0c8d27c134c33b7c4471d5de37e6c123d5 100644
|
| --- a/content/test/web_layer_tree_view_impl_for_testing.cc
|
| +++ b/content/test/web_layer_tree_view_impl_for_testing.cc
|
| @@ -11,7 +11,6 @@
|
| #include "cc/animation/animation_host.h"
|
| #include "cc/animation/animation_timeline.h"
|
| #include "cc/base/switches.h"
|
| -#include "cc/blink/web_compositor_animation_timeline_impl.h"
|
| #include "cc/blink/web_layer_impl.h"
|
| #include "cc/input/input_handler.h"
|
| #include "cc/layers/layer.h"
|
| @@ -66,23 +65,16 @@ void WebLayerTreeViewImplForTesting::clearRootLayer() {
|
| }
|
|
|
| void WebLayerTreeViewImplForTesting::attachCompositorAnimationTimeline(
|
| - blink::WebCompositorAnimationTimeline* compositor_timeline) {
|
| - DCHECK(compositor_timeline);
|
| + cc::AnimationTimeline* compositor_timeline) {
|
| DCHECK(layer_tree_host_->animation_host());
|
| - layer_tree_host_->animation_host()->AddAnimationTimeline(
|
| - static_cast<const cc_blink::WebCompositorAnimationTimelineImpl*>(
|
| - compositor_timeline)
|
| - ->animation_timeline());
|
| + layer_tree_host_->animation_host()->AddAnimationTimeline(compositor_timeline);
|
| }
|
|
|
| void WebLayerTreeViewImplForTesting::detachCompositorAnimationTimeline(
|
| - blink::WebCompositorAnimationTimeline* compositor_timeline) {
|
| - DCHECK(compositor_timeline);
|
| + cc::AnimationTimeline* compositor_timeline) {
|
| DCHECK(layer_tree_host_->animation_host());
|
| layer_tree_host_->animation_host()->RemoveAnimationTimeline(
|
| - static_cast<const cc_blink::WebCompositorAnimationTimelineImpl*>(
|
| - compositor_timeline)
|
| - ->animation_timeline());
|
| + compositor_timeline);
|
| }
|
|
|
| void WebLayerTreeViewImplForTesting::setViewportSize(
|
|
|