diff options
author | danakj <danakj@chromium.org> | 2015-06-16 15:48:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-16 22:49:31 +0000 |
commit | cf6105879590dbf12e023250821ddc9e3f807524 (patch) | |
tree | 713a43a6946547a70ea5ca04173146d3429032e9 /cc/layers/layer_iterator_unittest.cc | |
parent | b0e8c81ed1be3462355c5d5543d2636545029d63 (diff) | |
download | chromium_src-cf6105879590dbf12e023250821ddc9e3f807524.zip chromium_src-cf6105879590dbf12e023250821ddc9e3f807524.tar.gz chromium_src-cf6105879590dbf12e023250821ddc9e3f807524.tar.bz2 |
cc: Turn impl_side_painting and use_one_copy on in LayerTreeSettings.
Make these default to true in LayerTreeSettings so that all unit tests
will use them automatically unless they opt out. Fix all the tests
that crashed with this on, due to having a null cc::TaskGraphRunner.
R=enne, vmpstr
BUG=413479
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
NOTRY=true
Review URL: https://codereview.chromium.org/1177033008
Cr-Commit-Position: refs/heads/master@{#334726}
Diffstat (limited to 'cc/layers/layer_iterator_unittest.cc')
-rw-r--r-- | cc/layers/layer_iterator_unittest.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/cc/layers/layer_iterator_unittest.cc b/cc/layers/layer_iterator_unittest.cc index b53daee..130222d 100644 --- a/cc/layers/layer_iterator_unittest.cc +++ b/cc/layers/layer_iterator_unittest.cc @@ -8,6 +8,7 @@ #include "cc/layers/layer.h" #include "cc/test/fake_layer_tree_host.h" +#include "cc/test/test_task_graph_runner.h" #include "cc/trees/layer_tree_host_common.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -114,7 +115,9 @@ TEST(LayerIteratorTest, SimpleTree) { root_layer->AddChild(fourth); FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); - scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(&client); + TestTaskGraphRunner task_graph_runner; + scoped_ptr<FakeLayerTreeHost> host = + FakeLayerTreeHost::Create(&client, &task_graph_runner); host->SetRootLayer(root_layer); RenderSurfaceLayerList render_surface_layer_list; @@ -152,7 +155,9 @@ TEST(LayerIteratorTest, ComplexTree) { root23->AddChild(root231); FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); - scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(&client); + TestTaskGraphRunner task_graph_runner; + scoped_ptr<FakeLayerTreeHost> host = + FakeLayerTreeHost::Create(&client, &task_graph_runner); host->SetRootLayer(root_layer); RenderSurfaceLayerList render_surface_layer_list; @@ -199,7 +204,9 @@ TEST(LayerIteratorTest, ComplexTreeMultiSurface) { root23->AddChild(root231); FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D); - scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(&client); + TestTaskGraphRunner task_graph_runner; + scoped_ptr<FakeLayerTreeHost> host = + FakeLayerTreeHost::Create(&client, &task_graph_runner); host->SetRootLayer(root_layer); RenderSurfaceLayerList render_surface_layer_list; |