| Index: content/test/web_layer_tree_view_impl_for_testing.h
|
| diff --git a/content/test/web_layer_tree_view_impl_for_testing.h b/content/test/web_layer_tree_view_impl_for_testing.h
|
| index e2403bc3c54032303d4bb918aaafbf3bc52bcdde..e1926a1e8219990ece6c63d10cdb44197c54201d 100644
|
| --- a/content/test/web_layer_tree_view_impl_for_testing.h
|
| +++ b/content/test/web_layer_tree_view_impl_for_testing.h
|
| @@ -69,8 +69,9 @@ class WebLayerTreeViewImplForTesting
|
| 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 {}
|
|
|