| 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 d084c43abfc910c13aa45b9bc973015c33a99195..f216870e67013848077fd659900d1c8c90a5fd53 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -4454,7 +4454,7 @@ class LayerTreeHostTestGpuRasterizationEnabled : public LayerTreeHostTest {
|
| EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
|
|
|
| // Content-based veto is relevant as well.
|
| - recording_source->SetUnsuitableForGpuRasterizationForTesting();
|
| + recording_source->SetUnsuitableForGpuRasterization();
|
| EXPECT_FALSE(recording_source->IsSuitableForGpuRasterization());
|
| EXPECT_FALSE(layer->IsSuitableForGpuRasterization());
|
| // Veto will take effect when layers are updated.
|
| @@ -4493,8 +4493,12 @@ class LayerTreeHostTestGpuRasterizationForced : public LayerTreeHostTest {
|
| void SetupTree() override {
|
| LayerTreeHostTest::SetupTree();
|
|
|
| + scoped_ptr<FakeDisplayListRecordingSource> recording_source(
|
| + new FakeDisplayListRecordingSource(gfx::Size(100, 100)));
|
| scoped_refptr<FakePictureLayer> layer =
|
| - FakePictureLayer::Create(layer_settings(), &layer_client_);
|
| + FakePictureLayer::CreateWithRecordingSource(
|
| + layer_settings(), &layer_client_, recording_source.Pass());
|
| +
|
| layer->SetBounds(gfx::Size(10, 10));
|
| layer->SetIsDrawable(true);
|
| layer_tree_host()->root_layer()->AddChild(layer);
|
| @@ -4503,7 +4507,9 @@ class LayerTreeHostTestGpuRasterizationForced : public LayerTreeHostTest {
|
| void BeginTest() override {
|
| Layer* root = layer_tree_host()->root_layer();
|
| PictureLayer* layer = static_cast<PictureLayer*>(root->child_at(0));
|
| - RecordingSource* recording_source = layer->GetRecordingSourceForTesting();
|
| + FakeDisplayListRecordingSource* recording_source =
|
| + static_cast<FakeDisplayListRecordingSource*>(
|
| + layer->GetRecordingSourceForTesting());
|
|
|
| // Verify default values.
|
| EXPECT_TRUE(root->IsSuitableForGpuRasterization());
|
| @@ -4516,7 +4522,7 @@ class LayerTreeHostTestGpuRasterizationForced : public LayerTreeHostTest {
|
| EXPECT_TRUE(layer_tree_host()->has_gpu_rasterization_trigger());
|
|
|
| // Content-based veto is irrelevant as well.
|
| - recording_source->SetUnsuitableForGpuRasterizationForTesting();
|
| + recording_source->SetUnsuitableForGpuRasterization();
|
| EXPECT_FALSE(recording_source->IsSuitableForGpuRasterization());
|
| EXPECT_FALSE(layer->IsSuitableForGpuRasterization());
|
| // Veto will take effect when layers are updated.
|
|
|