Chromium Code Reviews| Index: cc/resources/picture_layer_tiling_set.h |
| diff --git a/cc/resources/picture_layer_tiling_set.h b/cc/resources/picture_layer_tiling_set.h |
| index fc1e581f5e88ba458a270881abd5367ca1b27bb0..1cddd1d7baeefea01c799ddb60830a4dc1f1dbba 100644 |
| --- a/cc/resources/picture_layer_tiling_set.h |
| +++ b/cc/resources/picture_layer_tiling_set.h |
| @@ -55,9 +55,15 @@ class CC_EXPORT PictureLayerTilingSet { |
| PictureLayerTilingSet* recycled_twin_set); |
| void RemoveNonIdealTilings(); |
| + // This function can be called on both the active and pending tree. |
| + // |pending_twin_set| represents the current pending twin. In situations where |
| + // this is called on the active tree, |pending_twin_set| represents the tiling |
| + // set from the pending twin layer. In situations where this is called on |
| + // either the pending tree or on the sync tree (in cases of one tree), |
|
danakj
2015/03/03 18:17:00
"is called on the sync tree" i think. the pending
vmpstr
2015/03/03 19:00:31
Done.
|
| + // |pending_twin_set| should be nullptr. |
| void UpdateTilingsToCurrentRasterSource( |
| scoped_refptr<RasterSource> raster_source, |
| - const PictureLayerTilingSet* twin_set, |
| + const PictureLayerTilingSet* pending_twin_set, |
| const Region& layer_invalidation, |
| float minimum_contents_scale, |
| float maximum_contents_scale); |
| @@ -163,6 +169,10 @@ class CC_EXPORT PictureLayerTilingSet { |
| float skewport_target_time_in_seconds, |
| int skewport_extrapolation_limit_in_content_pixels); |
| + void CopyTilingsFromPendingTwin( |
| + const PictureLayerTilingSet* pending_twin_set, |
| + const scoped_refptr<RasterSource>& raster_source); |
| + |
| // Remove one tiling. |
| void Remove(PictureLayerTiling* tiling); |