| Index: mojo/examples/compositor_app/compositor_host.cc
|
| diff --git a/mojo/examples/compositor_app/compositor_host.cc b/mojo/examples/compositor_app/compositor_host.cc
|
| index 1c47cdb59caa7b6e124d1d6a10170011733c6f35..0cc1aea0bba5c5658d1266c2c1082fdbdd01c4c7 100644
|
| --- a/mojo/examples/compositor_app/compositor_host.cc
|
| +++ b/mojo/examples/compositor_app/compositor_host.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "cc/layers/layer.h"
|
| #include "cc/layers/solid_color_layer.h"
|
| +#include "cc/output/begin_frame_args.h"
|
| #include "cc/output/context_provider.h"
|
| #include "cc/output/output_surface.h"
|
| #include "cc/trees/layer_tree_host.h"
|
| @@ -58,10 +59,10 @@ void CompositorHost::SetupScene() {
|
| void CompositorHost::WillBeginMainFrame(int frame_id) {}
|
| void CompositorHost::DidBeginMainFrame() {}
|
|
|
| -void CompositorHost::Animate(base::TimeTicks frame_begin_time) {
|
| +void CompositorHost::BeginMainFrame(const cc::BeginFrameArgs& args) {
|
| // TODO(jamesr): Should use cc's animation system.
|
| static const double kDegreesPerSecond = 70.0;
|
| - double time_in_seconds = (frame_begin_time - base::TimeTicks()).InSecondsF();
|
| + double time_in_seconds = (args.frame_time - base::TimeTicks()).InSecondsF();
|
| double child_rotation_degrees = kDegreesPerSecond * time_in_seconds;
|
| gfx::Transform child_transform;
|
| child_transform.Translate(200, 200);
|
|
|