| Index: content/renderer/gpu/render_widget_compositor.cc
|
| diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
|
| index 0f049dfe09dbda98adc7a60a15ff1e91b028c89a..86a5167c412579f047979363ac9457d719f0af46 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -24,7 +24,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/debug/layer_tree_debug_state.h"
|
| #include "cc/debug/micro_benchmark.h"
|
| @@ -608,21 +607,16 @@ void RenderWidgetCompositor::clearRootLayer() {
|
| }
|
|
|
| void RenderWidgetCompositor::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 RenderWidgetCompositor::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 RenderWidgetCompositor::setViewportSize(
|
|
|