| Index: cc/trees/layer_tree_host_impl_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
|
| index d81c3a8b4b790141b88935188548c5eff9792080..13d4ed368adfa5b00793390b5f16c02a2611ebed 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -47,12 +47,12 @@
|
| #include "cc/quads/tile_draw_quad.h"
|
| #include "cc/test/animation_test_common.h"
|
| #include "cc/test/begin_frame_args_test.h"
|
| -#include "cc/test/fake_display_list_raster_source.h"
|
| #include "cc/test/fake_layer_tree_host_impl.h"
|
| #include "cc/test/fake_mask_layer_impl.h"
|
| #include "cc/test/fake_output_surface.h"
|
| #include "cc/test/fake_output_surface_client.h"
|
| #include "cc/test/fake_picture_layer_impl.h"
|
| +#include "cc/test/fake_raster_source.h"
|
| #include "cc/test/fake_video_frame_provider.h"
|
| #include "cc/test/geometry_test_utils.h"
|
| #include "cc/test/gpu_rasterization_enabled_settings.h"
|
| @@ -7290,8 +7290,8 @@ TEST_F(LayerTreeHostImplTest, FarAwayQuadsDontNeedAA) {
|
| root->AddChild(std::move(scoped_scrolling_layer));
|
|
|
| gfx::Size content_layer_bounds(100000, 100);
|
| - scoped_refptr<FakeDisplayListRasterSource> raster_source(
|
| - FakeDisplayListRasterSource::CreateFilled(content_layer_bounds));
|
| + scoped_refptr<FakeRasterSource> raster_source(
|
| + FakeRasterSource::CreateFilled(content_layer_bounds));
|
|
|
| scoped_ptr<FakePictureLayerImpl> scoped_content_layer =
|
| FakePictureLayerImpl::CreateWithRasterSource(host_impl_->pending_tree(),
|
| @@ -9248,8 +9248,8 @@ TEST_F(ResourcelessSoftwareLayerTreeHostImplTest,
|
| host_impl_->SetViewportSize(viewport_size);
|
|
|
| host_impl_->CreatePendingTree();
|
| - scoped_refptr<FakeDisplayListRasterSource> raster_source(
|
| - FakeDisplayListRasterSource::CreateFilled(viewport_size));
|
| + scoped_refptr<FakeRasterSource> raster_source(
|
| + FakeRasterSource::CreateFilled(viewport_size));
|
| scoped_ptr<FakePictureLayerImpl> layer(
|
| FakePictureLayerImpl::CreateWithRasterSource(host_impl_->pending_tree(),
|
| 11, raster_source));
|
| @@ -9779,8 +9779,8 @@ TEST_F(LayerTreeHostImplTest, InvalidLayerNotAddedToRasterQueue) {
|
| host_impl_->CreatePendingTree();
|
|
|
| Region empty_invalidation;
|
| - scoped_refptr<DisplayListRasterSource> raster_source_with_tiles(
|
| - FakeDisplayListRasterSource::CreateFilled(gfx::Size(10, 10)));
|
| + scoped_refptr<RasterSource> raster_source_with_tiles(
|
| + FakeRasterSource::CreateFilled(gfx::Size(10, 10)));
|
|
|
| scoped_ptr<FakePictureLayerImpl> layer =
|
| FakePictureLayerImpl::Create(host_impl_->pending_tree(), 11);
|
|
|