| Index: cc/trees/threaded_channel.cc
|
| diff --git a/cc/trees/threaded_channel.cc b/cc/trees/threaded_channel.cc
|
| index 3d2eb33aeea4c201910de76db2c7f3ede10cd035..07b17cb571cc5c4798e28737a34323462064f8a2 100644
|
| --- a/cc/trees/threaded_channel.cc
|
| +++ b/cc/trees/threaded_channel.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/bind.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/trace_event/trace_event.h"
|
| +#include "cc/animation/animation_events.h"
|
| #include "cc/trees/layer_tree_host.h"
|
|
|
| namespace cc {
|
| @@ -214,12 +215,11 @@ void ThreadedChannel::DidCommitAndDrawFrame() {
|
| impl().proxy_main_weak_ptr));
|
| }
|
|
|
| -void ThreadedChannel::SetAnimationEvents(
|
| - scoped_ptr<AnimationEventsVector> queue) {
|
| +void ThreadedChannel::SetAnimationEvents(scoped_ptr<AnimationEvents> events) {
|
| DCHECK(IsImplThread());
|
| MainThreadTaskRunner()->PostTask(
|
| FROM_HERE, base::Bind(&ProxyMain::SetAnimationEvents,
|
| - impl().proxy_main_weak_ptr, base::Passed(&queue)));
|
| + impl().proxy_main_weak_ptr, base::Passed(&events)));
|
| }
|
|
|
| void ThreadedChannel::DidLoseOutputSurface() {
|
|
|