| 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 "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta, | 315 void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta, |
| 316 const gfx::Vector2dF& outer_delta, | 316 const gfx::Vector2dF& outer_delta, |
| 317 const gfx::Vector2dF& elastic_overscroll_delta, | 317 const gfx::Vector2dF& elastic_overscroll_delta, |
| 318 float page_scale, | 318 float page_scale, |
| 319 float top_controls_delta) override { | 319 float top_controls_delta) override { |
| 320 test_hooks_->ApplyViewportDeltas(inner_delta, outer_delta, | 320 test_hooks_->ApplyViewportDeltas(inner_delta, outer_delta, |
| 321 elastic_overscroll_delta, page_scale, | 321 elastic_overscroll_delta, page_scale, |
| 322 top_controls_delta); | 322 top_controls_delta); |
| 323 } | 323 } |
| 324 | 324 |
| 325 void RecordWheelAndTouchScrollingCount(bool has_scrolled_by_wheel, |
| 326 bool has_scrolled_by_touch) override {} |
| 327 |
| 325 void RequestNewCompositorFrameSink() override { | 328 void RequestNewCompositorFrameSink() override { |
| 326 test_hooks_->RequestNewCompositorFrameSink(); | 329 test_hooks_->RequestNewCompositorFrameSink(); |
| 327 } | 330 } |
| 328 | 331 |
| 329 void DidInitializeCompositorFrameSink() override { | 332 void DidInitializeCompositorFrameSink() override { |
| 330 test_hooks_->DidInitializeCompositorFrameSink(); | 333 test_hooks_->DidInitializeCompositorFrameSink(); |
| 331 } | 334 } |
| 332 | 335 |
| 333 void DidFailToInitializeCompositorFrameSink() override { | 336 void DidFailToInitializeCompositorFrameSink() override { |
| 334 test_hooks_->DidFailToInitializeCompositorFrameSink(); | 337 test_hooks_->DidFailToInitializeCompositorFrameSink(); |
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 886 DCHECK(task_runner_provider()->IsMainThread() || | 889 DCHECK(task_runner_provider()->IsMainThread() || |
| 887 task_runner_provider()->IsMainThreadBlocked()); | 890 task_runner_provider()->IsMainThreadBlocked()); |
| 888 return layer_tree_host_.get(); | 891 return layer_tree_host_.get(); |
| 889 } | 892 } |
| 890 | 893 |
| 891 Proxy* LayerTreeTest::proxy() { | 894 Proxy* LayerTreeTest::proxy() { |
| 892 return layer_tree_host() ? layer_tree_host()->proxy() : NULL; | 895 return layer_tree_host() ? layer_tree_host()->proxy() : NULL; |
| 893 } | 896 } |
| 894 | 897 |
| 895 } // namespace cc | 898 } // namespace cc |
| OLD | NEW |