| Index: cc/tiles/picture_layer_tiling.cc
|
| diff --git a/cc/tiles/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc
|
| index a9d10bbdfecc0365cac2b470f9640ddbf42ee0bb..4282204ee6198a38aa7daa892fcb3d7a4da1c0ae 100644
|
| --- a/cc/tiles/picture_layer_tiling.cc
|
| +++ b/cc/tiles/picture_layer_tiling.cc
|
| @@ -17,7 +17,7 @@
|
| #include "base/trace_event/trace_event.h"
|
| #include "base/trace_event/trace_event_argument.h"
|
| #include "cc/base/math_util.h"
|
| -#include "cc/playback/display_list_raster_source.h"
|
| +#include "cc/playback/raster_source.h"
|
| #include "cc/tiles/prioritized_tile.h"
|
| #include "cc/tiles/tile.h"
|
| #include "cc/tiles/tile_priority.h"
|
| @@ -38,7 +38,7 @@ const float kMaxSoonBorderDistanceInScreenPixels = 312.f;
|
| scoped_ptr<PictureLayerTiling> PictureLayerTiling::Create(
|
| WhichTree tree,
|
| float contents_scale,
|
| - scoped_refptr<DisplayListRasterSource> raster_source,
|
| + scoped_refptr<RasterSource> raster_source,
|
| PictureLayerTilingClient* client,
|
| size_t tiling_interest_area_padding,
|
| float skewport_target_time_in_seconds,
|
| @@ -52,7 +52,7 @@ scoped_ptr<PictureLayerTiling> PictureLayerTiling::Create(
|
| PictureLayerTiling::PictureLayerTiling(
|
| WhichTree tree,
|
| float contents_scale,
|
| - scoped_refptr<DisplayListRasterSource> raster_source,
|
| + scoped_refptr<RasterSource> raster_source,
|
| PictureLayerTilingClient* client,
|
| size_t tiling_interest_area_padding,
|
| float skewport_target_time_in_seconds,
|
| @@ -208,7 +208,7 @@ void PictureLayerTiling::TakeTilesAndPropertiesFrom(
|
| }
|
|
|
| void PictureLayerTiling::SetRasterSourceAndResize(
|
| - scoped_refptr<DisplayListRasterSource> raster_source) {
|
| + scoped_refptr<RasterSource> raster_source) {
|
| DCHECK(!raster_source->IsSolidColor());
|
| gfx::Size old_layer_bounds = raster_source_->GetSize();
|
| raster_source_ = std::move(raster_source);
|
|
|