| Index: cc/trees/proxy_main.cc
|
| diff --git a/cc/trees/proxy_main.cc b/cc/trees/proxy_main.cc
|
| index 1b06367eb0abc6a35204c863170d1841cdb860db..2175e7fb182020dbe9fee68a7cfb5d27fbcd4630 100644
|
| --- a/cc/trees/proxy_main.cc
|
| +++ b/cc/trees/proxy_main.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/trace_event/trace_event.h"
|
| #include "base/trace_event/trace_event_argument.h"
|
| #include "base/trace_event/trace_event_synthetic_delay.h"
|
| +#include "cc/animation/animation_events.h"
|
| #include "cc/debug/benchmark_instrumentation.h"
|
| #include "cc/debug/devtools_instrumentation.h"
|
| #include "cc/output/output_surface.h"
|
| @@ -80,7 +81,7 @@ void ProxyMain::DidCommitAndDrawFrame() {
|
| layer_tree_host_->DidCommitAndDrawFrame();
|
| }
|
|
|
| -void ProxyMain::SetAnimationEvents(scoped_ptr<AnimationEventsVector> events) {
|
| +void ProxyMain::SetAnimationEvents(scoped_ptr<AnimationEvents> events) {
|
| TRACE_EVENT0("cc", "ProxyMain::SetAnimationEvents");
|
| DCHECK(IsMainThread());
|
| layer_tree_host_->SetAnimationEvents(std::move(events));
|
|
|