From 34b7a15218828edc105d4c408556b05c52994840 Mon Sep 17 00:00:00 2001 From: reveman Date: Mon, 23 Mar 2015 13:27:47 -0700 Subject: 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} --- cc/trees/layer_tree_impl_unittest.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cc/trees/layer_tree_impl_unittest.cc') 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 host_impl_; }; -- cgit v1.1