| Index: cc/tiles/picture_layer_tiling_set.h
|
| diff --git a/cc/tiles/picture_layer_tiling_set.h b/cc/tiles/picture_layer_tiling_set.h
|
| index 06aa3a9300b2696c80213a9b74161d1f4969c817..41a2dad07e9c830708c0baa1670fa0e9420dd1ad 100644
|
| --- a/cc/tiles/picture_layer_tiling_set.h
|
| +++ b/cc/tiles/picture_layer_tiling_set.h
|
| @@ -58,7 +58,7 @@ class CC_EXPORT PictureLayerTilingSet {
|
|
|
| // This function is called on the active tree during activation.
|
| void UpdateTilingsToCurrentRasterSourceForActivation(
|
| - scoped_refptr<DisplayListRasterSource> raster_source,
|
| + scoped_refptr<RasterSource> raster_source,
|
| const PictureLayerTilingSet* pending_twin_set,
|
| const Region& layer_invalidation,
|
| float minimum_contents_scale,
|
| @@ -66,19 +66,18 @@ class CC_EXPORT PictureLayerTilingSet {
|
|
|
| // This function is called on the sync tree during commit.
|
| void UpdateTilingsToCurrentRasterSourceForCommit(
|
| - scoped_refptr<DisplayListRasterSource> raster_source,
|
| + scoped_refptr<RasterSource> raster_source,
|
| const Region& layer_invalidation,
|
| float minimum_contents_scale,
|
| float maximum_contents_scale);
|
|
|
| // This function is called on the sync tree right after commit.
|
| void UpdateRasterSourceDueToLCDChange(
|
| - scoped_refptr<DisplayListRasterSource> raster_source,
|
| + scoped_refptr<RasterSource> raster_source,
|
| const Region& layer_invalidation);
|
|
|
| - PictureLayerTiling* AddTiling(
|
| - float contents_scale,
|
| - scoped_refptr<DisplayListRasterSource> raster_source);
|
| + PictureLayerTiling* AddTiling(float contents_scale,
|
| + scoped_refptr<RasterSource> raster_source);
|
| size_t num_tilings() const { return tilings_.size(); }
|
| int NumHighResTilings() const;
|
| PictureLayerTiling* tiling_at(size_t idx) { return tilings_[idx].get(); }
|
| @@ -183,7 +182,7 @@ class CC_EXPORT PictureLayerTilingSet {
|
|
|
| void CopyTilingsAndPropertiesFromPendingTwin(
|
| const PictureLayerTilingSet* pending_twin_set,
|
| - scoped_refptr<DisplayListRasterSource> raster_source,
|
| + scoped_refptr<RasterSource> raster_source,
|
| const Region& layer_invalidation);
|
|
|
| // Remove one tiling.
|
|
|