| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index 2a9f8eb9ebd2a5dfe1e1e96e8e031ac7fd0f416a..b22eda69ac35423021554c0fbaa1f242967dc54c 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -5147,11 +5147,11 @@ class LayerTreeHostTestGpuRasterizationDefault : public LayerTreeHostTest {
|
|
|
| void BeginTest() override {
|
| // Verify default value.
|
| - EXPECT_FALSE(layer_tree_host()->has_gpu_rasterization_trigger());
|
| + EXPECT_FALSE(layer_tree_host_in_process()->has_gpu_rasterization_trigger());
|
|
|
| // Setting gpu rasterization trigger does not enable gpu rasterization.
|
| layer_tree_host()->SetHasGpuRasterizationTrigger(true);
|
| - EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
|
| + EXPECT_TRUE(layer_tree_host_in_process()->has_gpu_rasterization_trigger());
|
|
|
| PostSetNeedsCommitToMainThread();
|
| }
|
| @@ -5202,7 +5202,7 @@ class LayerTreeHostTestEmptyLayerGpuRasterization : public LayerTreeHostTest {
|
| void BeginTest() override {
|
| // Setting gpu rasterization trigger does not enable gpu rasterization.
|
| layer_tree_host()->SetHasGpuRasterizationTrigger(true);
|
| - EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
|
| + EXPECT_TRUE(layer_tree_host_in_process()->has_gpu_rasterization_trigger());
|
|
|
| PostSetNeedsCommitToMainThread();
|
| }
|
| @@ -5257,11 +5257,11 @@ class LayerTreeHostTestGpuRasterizationEnabled : public LayerTreeHostTest {
|
|
|
| void BeginTest() override {
|
| // Verify default value.
|
| - EXPECT_FALSE(layer_tree_host()->has_gpu_rasterization_trigger());
|
| + EXPECT_FALSE(layer_tree_host_in_process()->has_gpu_rasterization_trigger());
|
|
|
| // Gpu rasterization trigger is relevant.
|
| layer_tree_host()->SetHasGpuRasterizationTrigger(true);
|
| - EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
|
| + EXPECT_TRUE(layer_tree_host_in_process()->has_gpu_rasterization_trigger());
|
|
|
| // Content-based veto is relevant as well.
|
| layer_->set_force_unsuitable_for_gpu_rasterization(true);
|
| @@ -5325,11 +5325,11 @@ class LayerTreeHostTestGpuRasterizationReenabled : public LayerTreeHostTest {
|
|
|
| void BeginTest() override {
|
| // Verify default value.
|
| - EXPECT_FALSE(layer_tree_host()->has_gpu_rasterization_trigger());
|
| + EXPECT_FALSE(layer_tree_host_in_process()->has_gpu_rasterization_trigger());
|
|
|
| // Gpu rasterization trigger is relevant.
|
| layer_tree_host()->SetHasGpuRasterizationTrigger(true);
|
| - EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
|
| + EXPECT_TRUE(layer_tree_host_in_process()->has_gpu_rasterization_trigger());
|
|
|
| // Content-based veto is relevant as well.
|
| layer_->set_force_unsuitable_for_gpu_rasterization(true);
|
| @@ -5408,11 +5408,11 @@ class LayerTreeHostTestGpuRasterizationForced : public LayerTreeHostTest {
|
|
|
| void BeginTest() override {
|
| // Verify default value.
|
| - EXPECT_FALSE(layer_tree_host()->has_gpu_rasterization_trigger());
|
| + EXPECT_FALSE(layer_tree_host_in_process()->has_gpu_rasterization_trigger());
|
|
|
| // With gpu rasterization forced, gpu rasterization trigger is irrelevant.
|
| layer_tree_host()->SetHasGpuRasterizationTrigger(true);
|
| - EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
|
| + EXPECT_TRUE(layer_tree_host_in_process()->has_gpu_rasterization_trigger());
|
|
|
| // Content-based veto is irrelevant as well.
|
| layer_->set_force_unsuitable_for_gpu_rasterization(true);
|
| @@ -5752,7 +5752,7 @@ class LayerTreeHostAcceptsDeltasFromImplWithoutRootLayer
|
| void BeginMainFrame(const BeginFrameArgs& args) override {
|
| EXPECT_EQ(nullptr, layer_tree()->root_layer());
|
|
|
| - layer_tree_host()->ApplyScrollAndScale(&info_);
|
| + layer_tree_host_in_process()->ApplyScrollAndScale(&info_);
|
| EndTest();
|
| }
|
|
|
|
|