| Index: cc/tiles/picture_layer_tiling_set.cc
|
| diff --git a/cc/tiles/picture_layer_tiling_set.cc b/cc/tiles/picture_layer_tiling_set.cc
|
| index a9e16f58a7343ad190431dd4e53f29f7504c680b..9facf9f252c980da9c8f8d1cef8876c58dd79827 100644
|
| --- a/cc/tiles/picture_layer_tiling_set.cc
|
| +++ b/cc/tiles/picture_layer_tiling_set.cc
|
| @@ -8,7 +8,7 @@
|
| #include <set>
|
| #include <vector>
|
|
|
| -#include "cc/playback/raster_source.h"
|
| +#include "cc/playback/display_list_raster_source.h"
|
|
|
| namespace cc {
|
|
|
| @@ -60,7 +60,7 @@ PictureLayerTilingSet::~PictureLayerTilingSet() {
|
|
|
| void PictureLayerTilingSet::CopyTilingsAndPropertiesFromPendingTwin(
|
| const PictureLayerTilingSet* pending_twin_set,
|
| - const scoped_refptr<RasterSource>& raster_source,
|
| + const scoped_refptr<DisplayListRasterSource>& raster_source,
|
| const Region& layer_invalidation) {
|
| if (pending_twin_set->tilings_.empty()) {
|
| // If the twin (pending) tiling set is empty, it was not updated for the
|
| @@ -92,7 +92,7 @@ void PictureLayerTilingSet::CopyTilingsAndPropertiesFromPendingTwin(
|
| }
|
|
|
| void PictureLayerTilingSet::UpdateTilingsToCurrentRasterSourceForActivation(
|
| - scoped_refptr<RasterSource> raster_source,
|
| + scoped_refptr<DisplayListRasterSource> raster_source,
|
| const PictureLayerTilingSet* pending_twin_set,
|
| const Region& layer_invalidation,
|
| float minimum_contents_scale,
|
| @@ -131,7 +131,7 @@ void PictureLayerTilingSet::UpdateTilingsToCurrentRasterSourceForActivation(
|
| }
|
|
|
| void PictureLayerTilingSet::UpdateTilingsToCurrentRasterSourceForCommit(
|
| - scoped_refptr<RasterSource> raster_source,
|
| + scoped_refptr<DisplayListRasterSource> raster_source,
|
| const Region& layer_invalidation,
|
| float minimum_contents_scale,
|
| float maximum_contents_scale) {
|
| @@ -157,7 +157,7 @@ void PictureLayerTilingSet::UpdateTilingsToCurrentRasterSourceForCommit(
|
| }
|
|
|
| void PictureLayerTilingSet::UpdateRasterSourceDueToLCDChange(
|
| - const scoped_refptr<RasterSource>& raster_source,
|
| + const scoped_refptr<DisplayListRasterSource>& raster_source,
|
| const Region& layer_invalidation) {
|
| for (PictureLayerTiling* tiling : tilings_) {
|
| tiling->SetRasterSourceAndResize(raster_source);
|
| @@ -242,7 +242,7 @@ void PictureLayerTilingSet::MarkAllTilingsNonIdeal() {
|
|
|
| PictureLayerTiling* PictureLayerTilingSet::AddTiling(
|
| float contents_scale,
|
| - scoped_refptr<RasterSource> raster_source) {
|
| + scoped_refptr<DisplayListRasterSource> raster_source) {
|
| for (size_t i = 0; i < tilings_.size(); ++i) {
|
| DCHECK_NE(tilings_[i]->contents_scale(), contents_scale);
|
| DCHECK_EQ(tilings_[i]->raster_source(), raster_source.get());
|
|
|