| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index 1fd7f6e2355bf15323858f310a34e2dbf61f7a9a..9a7cc581733b07494d8ae32cb2c3456f1cc1151c 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -863,8 +863,9 @@ class LayerTreeHostTestStartPageScaleAnimation : public LayerTreeHostTest {
|
|
|
| virtual void BeginTest() OVERRIDE { PostSetNeedsCommitToMainThread(); }
|
|
|
| - virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta,
|
| - float scale) OVERRIDE {
|
| + virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta,
|
| + float scale,
|
| + float) OVERRIDE {
|
| gfx::Vector2d offset = scroll_layer_->scroll_offset();
|
| scroll_layer_->SetScrollOffset(offset + scroll_delta);
|
| layer_tree_host()->SetPageScaleFactorAndLimits(scale, 0.5f, 2.f);
|
|
|