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/layers/picture_layer_impl_perftest.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/layers/picture_layer_impl_perftest.cc')
| -rw-r--r-- | cc/layers/picture_layer_impl_perftest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cc/layers/picture_layer_impl_perftest.cc b/cc/layers/picture_layer_impl_perftest.cc index ea73cb2..47f49be 100644 --- a/cc/layers/picture_layer_impl_perftest.cc +++ b/cc/layers/picture_layer_impl_perftest.cc @@ -13,6 +13,7 @@ #include "cc/test/fake_picture_pile_impl.h" #include "cc/test/impl_side_painting_settings.h" #include "cc/test/test_shared_bitmap_manager.h" +#include "cc/test/test_task_graph_runner.h" #include "cc/trees/layer_tree_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/perf/perf_test.h" @@ -41,7 +42,8 @@ class PictureLayerImplPerfTest : public testing::Test { : proxy_(base::MessageLoopProxy::current()), host_impl_(ImplSidePaintingSettings(), &proxy_, - &shared_bitmap_manager_), + &shared_bitmap_manager_, + &task_graph_runner_), timer_(kWarmupRuns, base::TimeDelta::FromMilliseconds(kTimeLimitMillis), kTimeCheckInterval) {} @@ -170,6 +172,7 @@ class PictureLayerImplPerfTest : public testing::Test { protected: TestSharedBitmapManager shared_bitmap_manager_; + TestTaskGraphRunner task_graph_runner_; FakeImplProxy proxy_; FakeLayerTreeHostImpl host_impl_; FakePictureLayerImpl* pending_layer_; |