| Index: cc/tiles/tile_manager_perftest.cc
|
| diff --git a/cc/tiles/tile_manager_perftest.cc b/cc/tiles/tile_manager_perftest.cc
|
| index 7529e36e45f3bc4d1da4760fdf88bdefe11f3f38..cc0a41497e9ce839bf102380d67602d93614ffcd 100644
|
| --- a/cc/tiles/tile_manager_perftest.cc
|
| +++ b/cc/tiles/tile_manager_perftest.cc
|
| @@ -12,12 +12,12 @@
|
| #include "cc/debug/lap_timer.h"
|
| #include "cc/raster/raster_buffer.h"
|
| #include "cc/test/begin_frame_args_test.h"
|
| -#include "cc/test/fake_display_list_raster_source.h"
|
| #include "cc/test/fake_impl_task_runner_provider.h"
|
| #include "cc/test/fake_layer_tree_host_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_tile_manager.h"
|
| #include "cc/test/fake_tile_manager_client.h"
|
| #include "cc/test/test_shared_bitmap_manager.h"
|
| @@ -130,10 +130,10 @@ class TileManagerPerfTest : public testing::Test {
|
| }
|
|
|
| void SetupDefaultTrees(const gfx::Size& layer_bounds) {
|
| - scoped_refptr<FakeDisplayListRasterSource> pending_raster_source =
|
| - FakeDisplayListRasterSource::CreateFilled(layer_bounds);
|
| - scoped_refptr<FakeDisplayListRasterSource> active_raster_source =
|
| - FakeDisplayListRasterSource::CreateFilled(layer_bounds);
|
| + scoped_refptr<FakeRasterSource> pending_raster_source =
|
| + FakeRasterSource::CreateFilled(layer_bounds);
|
| + scoped_refptr<FakeRasterSource> active_raster_source =
|
| + FakeRasterSource::CreateFilled(layer_bounds);
|
|
|
| SetupTrees(pending_raster_source, active_raster_source);
|
| }
|
| @@ -153,14 +153,14 @@ class TileManagerPerfTest : public testing::Test {
|
| active_root_layer_->set_fixed_tile_size(tile_size);
|
| }
|
|
|
| - void SetupTrees(scoped_refptr<DisplayListRasterSource> pending_raster_source,
|
| - scoped_refptr<DisplayListRasterSource> active_raster_source) {
|
| + void SetupTrees(scoped_refptr<RasterSource> pending_raster_source,
|
| + scoped_refptr<RasterSource> active_raster_source) {
|
| SetupPendingTree(active_raster_source);
|
| ActivateTree();
|
| SetupPendingTree(pending_raster_source);
|
| }
|
|
|
| - void SetupPendingTree(scoped_refptr<DisplayListRasterSource> raster_source) {
|
| + void SetupPendingTree(scoped_refptr<RasterSource> raster_source) {
|
| host_impl_.CreatePendingTree();
|
| LayerTreeImpl* pending_tree = host_impl_.pending_tree();
|
| // Clear recycled tree.
|
| @@ -347,8 +347,8 @@ class TileManagerPerfTest : public testing::Test {
|
| int next_id = id_ + 1;
|
|
|
| // Create the rest of the layers as children of the root layer.
|
| - scoped_refptr<FakeDisplayListRasterSource> raster_source =
|
| - FakeDisplayListRasterSource::CreateFilled(layer_bounds);
|
| + scoped_refptr<FakeRasterSource> raster_source =
|
| + FakeRasterSource::CreateFilled(layer_bounds);
|
| while (static_cast<int>(layers.size()) < layer_count) {
|
| scoped_ptr<FakePictureLayerImpl> layer =
|
| FakePictureLayerImpl::CreateWithRasterSource(
|
|
|