diff options
author | skyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 15:51:27 +0000 |
---|---|---|
committer | skyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 15:51:27 +0000 |
commit | 27e6a21ba3ba5db38dc35548188445884ad004be (patch) | |
tree | f99f8b6317a1f534e98d774c54af087a79fab935 /cc/layers | |
parent | 849a746b63a4bedb06c2ec4b591215e184c30b67 (diff) | |
download | chromium_src-27e6a21ba3ba5db38dc35548188445884ad004be.zip chromium_src-27e6a21ba3ba5db38dc35548188445884ad004be.tar.gz chromium_src-27e6a21ba3ba5db38dc35548188445884ad004be.tar.bz2 |
cc: Parameterize the main thread task runner
Make it possible for clients pass in a custom task runner to be used for
posting compositor related work onto the main thread. This will be used
for prioritizing compositor tasks by the Blink scheduler.
Covered by existing tests.
BUG=391005
Review URL: https://codereview.chromium.org/400773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers')
-rw-r--r-- | cc/layers/layer_perftest.cc | 3 | ||||
-rw-r--r-- | cc/layers/layer_unittest.cc | 19 | ||||
-rw-r--r-- | cc/layers/scrollbar_layer_unittest.cc | 2 | ||||
-rw-r--r-- | cc/layers/texture_layer_unittest.cc | 2 | ||||
-rw-r--r-- | cc/layers/tiled_layer_unittest.cc | 3 | ||||
-rw-r--r-- | cc/layers/ui_resource_layer_unittest.cc | 3 |
6 files changed, 20 insertions, 12 deletions
diff --git a/cc/layers/layer_perftest.cc b/cc/layers/layer_perftest.cc index 1c4519a..6df6cfd 100644 --- a/cc/layers/layer_perftest.cc +++ b/cc/layers/layer_perftest.cc @@ -41,7 +41,8 @@ class LayerPerfTest : public testing::Test { protected: virtual void SetUp() OVERRIDE { layer_tree_host_ = FakeLayerTreeHost::Create(); - layer_tree_host_->InitializeSingleThreaded(&fake_client_); + layer_tree_host_->InitializeSingleThreaded( + &fake_client_, base::MessageLoopProxy::current()); } virtual void TearDown() OVERRIDE { diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc index ba77513..246ec43 100644 --- a/cc/layers/layer_unittest.cc +++ b/cc/layers/layer_unittest.cc @@ -41,7 +41,7 @@ class MockLayerTreeHost : public LayerTreeHost { public: explicit MockLayerTreeHost(FakeLayerTreeHostClient* client) : LayerTreeHost(client, NULL, LayerTreeSettings()) { - InitializeSingleThreaded(client); + InitializeSingleThreaded(client, base::MessageLoopProxy::current()); } MOCK_METHOD0(SetNeedsCommit, void()); @@ -873,16 +873,21 @@ class LayerTreeHostFactory { shared_bitmap_manager_(new TestSharedBitmapManager()) {} scoped_ptr<LayerTreeHost> Create() { - return LayerTreeHost::CreateSingleThreaded(&client_, - &client_, - shared_bitmap_manager_.get(), - LayerTreeSettings()).Pass(); + return LayerTreeHost::CreateSingleThreaded( + &client_, + &client_, + shared_bitmap_manager_.get(), + LayerTreeSettings(), + base::MessageLoopProxy::current()).Pass(); } scoped_ptr<LayerTreeHost> Create(LayerTreeSettings settings) { return LayerTreeHost::CreateSingleThreaded( - &client_, &client_, shared_bitmap_manager_.get(), settings) - .Pass(); + &client_, + &client_, + shared_bitmap_manager_.get(), + settings, + base::MessageLoopProxy::current()).Pass(); } private: diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc index e7a477b..7b5eb9e 100644 --- a/cc/layers/scrollbar_layer_unittest.cc +++ b/cc/layers/scrollbar_layer_unittest.cc @@ -574,7 +574,7 @@ class MockLayerTreeHost : public LayerTreeHost { next_id_(1), total_ui_resource_created_(0), total_ui_resource_deleted_(0) { - InitializeSingleThreaded(client); + InitializeSingleThreaded(client, base::MessageLoopProxy::current()); } virtual UIResourceId CreateUIResource(UIResourceClient* content) OVERRIDE { diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc index 2be7527..3d4ea23 100644 --- a/cc/layers/texture_layer_unittest.cc +++ b/cc/layers/texture_layer_unittest.cc @@ -52,7 +52,7 @@ class MockLayerTreeHost : public LayerTreeHost { public: explicit MockLayerTreeHost(FakeLayerTreeHostClient* client) : LayerTreeHost(client, NULL, LayerTreeSettings()) { - InitializeSingleThreaded(client); + InitializeSingleThreaded(client, base::MessageLoopProxy::current()); } MOCK_METHOD0(SetNeedsCommit, void()); diff --git a/cc/layers/tiled_layer_unittest.cc b/cc/layers/tiled_layer_unittest.cc index bd15f2f..fb6b488 100644 --- a/cc/layers/tiled_layer_unittest.cc +++ b/cc/layers/tiled_layer_unittest.cc @@ -83,7 +83,8 @@ class SynchronousOutputSurfaceLayerTreeHost : public LayerTreeHost { scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner) : LayerTreeHost(client, manager, settings), output_surface_created_(false) { - LayerTreeHost::InitializeThreaded(impl_task_runner); + LayerTreeHost::InitializeThreaded(base::MessageLoopProxy::current(), + impl_task_runner); } bool output_surface_created_; diff --git a/cc/layers/ui_resource_layer_unittest.cc b/cc/layers/ui_resource_layer_unittest.cc index 25cc2c7..f6a460e 100644 --- a/cc/layers/ui_resource_layer_unittest.cc +++ b/cc/layers/ui_resource_layer_unittest.cc @@ -35,7 +35,8 @@ class UIResourceLayerTest : public testing::Test { protected: virtual void SetUp() { layer_tree_host_ = FakeLayerTreeHost::Create(); - layer_tree_host_->InitializeSingleThreaded(&fake_client_); + layer_tree_host_->InitializeSingleThreaded( + &fake_client_, base::MessageLoopProxy::current()); } virtual void TearDown() { |