| 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 0cc1aea0bba5c5658d1266c2c1082fdbdd01c4c7..90d04bbd6dddb74495eaa5ee5946ca29d9c75b37 100644
|
| --- a/mojo/examples/compositor_app/compositor_host.cc
|
| +++ b/mojo/examples/compositor_app/compositor_host.cc
|
| @@ -72,8 +72,9 @@ void CompositorHost::BeginMainFrame(const cc::BeginFrameArgs& args) {
|
| }
|
|
|
| void CompositorHost::Layout() {}
|
| -void CompositorHost::ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
|
| - float page_scale) {}
|
| +void CompositorHost::ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
|
| + float page_scale,
|
| + float top_controls_delta) {}
|
|
|
| scoped_ptr<cc::OutputSurface> CompositorHost::CreateOutputSurface(
|
| bool fallback) {
|
|
|