| Index: ui/compositor/compositor.h
|
| diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
|
| index 5f4ed2ee4d2c564eef8fb6c1a79d2a75fa188cc3..63f4dec550e3636c4f5cbed97058ab828332c8fb 100644
|
| --- a/ui/compositor/compositor.h
|
| +++ b/ui/compositor/compositor.h
|
| @@ -232,8 +232,10 @@ class COMPOSITOR_EXPORT Compositor
|
| virtual void DidBeginMainFrame() OVERRIDE {}
|
| virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| - virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
|
| - float page_scale) OVERRIDE {}
|
| + virtual void ApplyViewportDeltas(
|
| + const gfx::Vector2d& scroll_delta,
|
| + float page_scale,
|
| + float top_controls_delta) OVERRIDE {}
|
| virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback)
|
| OVERRIDE;
|
| virtual void DidInitializeOutputSurface() OVERRIDE {}
|
|
|