diff options
| author | khushalsagar <khushalsagar@chromium.org> | 2015-10-21 12:25:16 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-21 19:26:08 +0000 |
| commit | b64b360d1ccab108abfaa1b08b17ab8a7b48dcce (patch) | |
| tree | b6421c6e109d4e4ac91a64f0e2d2fe3fcc7ad17f /cc/animation | |
| parent | d502b83c802a28f76e8b6471ae3218b2b4a33fb1 (diff) | |
| download | chromium_src-b64b360d1ccab108abfaa1b08b17ab8a7b48dcce.zip chromium_src-b64b360d1ccab108abfaa1b08b17ab8a7b48dcce.tar.gz chromium_src-b64b360d1ccab108abfaa1b08b17ab8a7b48dcce.tar.bz2 | |
cc: Split Proxy to eliminate unnecessary dependencies on the impl side
The impl side of the compositor uses Proxy to only access the
task runners and make debug assertions. Move those parts to
TaskRunnerProvider to seperate these dependencies.
BUG=527200
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1411663002
Cr-Commit-Position: refs/heads/master@{#355370}
Diffstat (limited to 'cc/animation')
| -rw-r--r-- | cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc | 8 | ||||
| -rw-r--r-- | cc/animation/scrollbar_animation_controller_thinning_unittest.cc | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc index 2c8f993..aa9b74f 100644 --- a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc +++ b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc @@ -5,7 +5,7 @@ #include "cc/animation/scrollbar_animation_controller_linear_fade.h" #include "cc/layers/solid_color_scrollbar_layer_impl.h" -#include "cc/test/fake_impl_proxy.h" +#include "cc/test/fake_impl_task_runner_provider.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/test_shared_bitmap_manager.h" @@ -21,7 +21,9 @@ class ScrollbarAnimationControllerLinearFadeTest public ScrollbarAnimationControllerClient { public: ScrollbarAnimationControllerLinearFadeTest() - : host_impl_(&proxy_, &shared_bitmap_manager_, &task_graph_runner_), + : host_impl_(&task_runner_provider_, + &shared_bitmap_manager_, + &task_graph_runner_), did_request_redraw_(false), did_request_animate_(false) {} @@ -73,7 +75,7 @@ class ScrollbarAnimationControllerLinearFadeTest virtual ScrollbarOrientation orientation() const { return HORIZONTAL; } - FakeImplProxy proxy_; + FakeImplTaskRunnerProvider task_runner_provider_; TestSharedBitmapManager shared_bitmap_manager_; TestTaskGraphRunner task_graph_runner_; FakeLayerTreeHostImpl host_impl_; diff --git a/cc/animation/scrollbar_animation_controller_thinning_unittest.cc b/cc/animation/scrollbar_animation_controller_thinning_unittest.cc index 3c5ff36..e8f8f90 100644 --- a/cc/animation/scrollbar_animation_controller_thinning_unittest.cc +++ b/cc/animation/scrollbar_animation_controller_thinning_unittest.cc @@ -5,7 +5,7 @@ #include "cc/animation/scrollbar_animation_controller_thinning.h" #include "cc/layers/solid_color_scrollbar_layer_impl.h" -#include "cc/test/fake_impl_proxy.h" +#include "cc/test/fake_impl_task_runner_provider.h" #include "cc/test/fake_layer_tree_host_impl.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/test_shared_bitmap_manager.h" @@ -21,7 +21,9 @@ class ScrollbarAnimationControllerThinningTest public ScrollbarAnimationControllerClient { public: ScrollbarAnimationControllerThinningTest() - : host_impl_(&proxy_, &shared_bitmap_manager_, &task_graph_runner_) {} + : host_impl_(&task_runner_provider_, + &shared_bitmap_manager_, + &task_graph_runner_) {} void PostDelayedScrollbarAnimationTask(const base::Closure& start_fade, base::TimeDelta delay) override { @@ -70,7 +72,7 @@ class ScrollbarAnimationControllerThinningTest base::TimeDelta::FromSeconds(5), base::TimeDelta::FromSeconds(3)); } - FakeImplProxy proxy_; + FakeImplTaskRunnerProvider task_runner_provider_; TestSharedBitmapManager shared_bitmap_manager_; TestTaskGraphRunner task_graph_runner_; FakeLayerTreeHostImpl host_impl_; |