OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/test/layer_tree_test.h" | 5 #include "cc/test/layer_tree_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "cc/animation/animation.h" | 8 #include "cc/animation/animation.h" |
9 #include "cc/animation/animation_registrar.h" | 9 #include "cc/animation/animation_registrar.h" |
10 #include "cc/animation/layer_animation_controller.h" | 10 #include "cc/animation/layer_animation_controller.h" |
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 void DidBeginMainFrame() override { test_hooks_->DidBeginMainFrame(); } | 355 void DidBeginMainFrame() override { test_hooks_->DidBeginMainFrame(); } |
356 | 356 |
357 void BeginMainFrame(const BeginFrameArgs& args) override { | 357 void BeginMainFrame(const BeginFrameArgs& args) override { |
358 test_hooks_->BeginMainFrame(args); | 358 test_hooks_->BeginMainFrame(args); |
359 } | 359 } |
360 | 360 |
361 void Layout() override { test_hooks_->Layout(); } | 361 void Layout() override { test_hooks_->Layout(); } |
362 | 362 |
363 void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, | 363 void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, |
364 const gfx::Vector2d& outer_delta, | 364 const gfx::Vector2d& outer_delta, |
| 365 const gfx::Vector2dF& elastic_overscroll_delta, |
365 float page_scale, | 366 float page_scale, |
366 float top_controls_delta) override { | 367 float top_controls_delta) override { |
367 test_hooks_->ApplyViewportDeltas(inner_delta, | 368 test_hooks_->ApplyViewportDeltas(inner_delta, outer_delta, |
368 outer_delta, | 369 elastic_overscroll_delta, page_scale, |
369 page_scale, | |
370 top_controls_delta); | 370 top_controls_delta); |
371 } | 371 } |
372 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, | 372 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |
373 float scale, | 373 float scale, |
374 float top_controls_delta) override { | 374 float top_controls_delta) override { |
375 test_hooks_->ApplyViewportDeltas(scroll_delta, | 375 test_hooks_->ApplyViewportDeltas(scroll_delta, |
376 scale, | 376 scale, |
377 top_controls_delta); | 377 top_controls_delta); |
378 } | 378 } |
379 | 379 |
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
829 return -1; | 829 return -1; |
830 } | 830 } |
831 | 831 |
832 void LayerTreeTest::DestroyLayerTreeHost() { | 832 void LayerTreeTest::DestroyLayerTreeHost() { |
833 if (layer_tree_host_ && layer_tree_host_->root_layer()) | 833 if (layer_tree_host_ && layer_tree_host_->root_layer()) |
834 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); | 834 layer_tree_host_->root_layer()->SetLayerTreeHost(NULL); |
835 layer_tree_host_ = nullptr; | 835 layer_tree_host_ = nullptr; |
836 } | 836 } |
837 | 837 |
838 } // namespace cc | 838 } // namespace cc |
OLD | NEW |