diff options
author | reveman <reveman@chromium.org> | 2015-03-23 13:27:47 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-23 20:29:01 +0000 |
commit | 34b7a15218828edc105d4c408556b05c52994840 (patch) | |
tree | 9abba677c77d4591e04d2a57e445d9ec10de64c6 /cc/trees/layer_tree_impl_unittest.cc | |
parent | 15accba3b4eceb8527867e87573eabe13cb13b1b (diff) | |
download | chromium_src-34b7a15218828edc105d4c408556b05c52994840.zip chromium_src-34b7a15218828edc105d4c408556b05c52994840.tar.gz chromium_src-34b7a15218828edc105d4c408556b05c52994840.tar.bz2 |
cc: Move worker threads to RenderThreadImpl.
This allows us to Join the threads when RenderThreadImpl
is shutdown.
BUG=468785
TEST=cc_unittests
Review URL: https://codereview.chromium.org/999173004
Cr-Commit-Position: refs/heads/master@{#321836}
Diffstat (limited to 'cc/trees/layer_tree_impl_unittest.cc')
-rw-r--r-- | cc/trees/layer_tree_impl_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc index 06df3c2..c4abd52 100644 --- a/cc/trees/layer_tree_impl_unittest.cc +++ b/cc/trees/layer_tree_impl_unittest.cc @@ -13,6 +13,7 @@ #include "cc/test/geometry_test_utils.h" #include "cc/test/layer_tree_host_common_test.h" #include "cc/test/test_shared_bitmap_manager.h" +#include "cc/test/test_task_graph_runner.h" #include "cc/trees/layer_tree_host_impl.h" #include "ui/gfx/geometry/size_conversions.h" @@ -25,8 +26,8 @@ class LayerTreeImplTest : public LayerTreeHostCommonTest { LayerTreeSettings settings; settings.layer_transforms_should_scale_layer_contents = true; settings.scrollbar_show_scale_threshold = 1.1f; - host_impl_.reset( - new FakeLayerTreeHostImpl(settings, &proxy_, &shared_bitmap_manager_)); + host_impl_.reset(new FakeLayerTreeHostImpl( + settings, &proxy_, &shared_bitmap_manager_, &task_graph_runner_)); EXPECT_TRUE(host_impl_->InitializeRenderer(FakeOutputSurface::Create3d())); } @@ -40,6 +41,7 @@ class LayerTreeImplTest : public LayerTreeHostCommonTest { private: TestSharedBitmapManager shared_bitmap_manager_; + TestTaskGraphRunner task_graph_runner_; FakeImplProxy proxy_; scoped_ptr<FakeLayerTreeHostImpl> host_impl_; }; |