| Index: cc/picture_layer_tiling_set.h
|
| diff --git a/cc/picture_layer_tiling_set.h b/cc/picture_layer_tiling_set.h
|
| index bc70927a755ef9a28bc8a232812975d8706f2518..29ad92ff269458677e8194a5225287bddc3c2a63 100644
|
| --- a/cc/picture_layer_tiling_set.h
|
| +++ b/cc/picture_layer_tiling_set.h
|
| @@ -18,14 +18,20 @@ class CC_EXPORT PictureLayerTilingSet {
|
| ~PictureLayerTilingSet();
|
|
|
| // Shallow copies all data (except client) from other.
|
| - void CloneFrom(const PictureLayerTilingSet& other);
|
| + void CloneAll(
|
| + const PictureLayerTilingSet& other,
|
| + const Region& invalidation);
|
| + void Clone(const PictureLayerTiling* tiling, const Region& invalidation);
|
| +
|
| + // TODO(enne): Remove this once syncing happens to the pending tree.
|
| + void Invalidate(const Region& invalidation);
|
|
|
| void SetLayerBounds(gfx::Size layer_bounds);
|
| gfx::Size LayerBounds() const;
|
|
|
| - void Invalidate(const Region& invalidation);
|
| -
|
| - void AddTiling(float contents_scale, gfx::Size tile_size);
|
| + const PictureLayerTiling* AddTiling(
|
| + float contents_scale,
|
| + gfx::Size tile_size);
|
| size_t num_tilings() const { return tilings_.size(); }
|
|
|
| void Reset();
|
| @@ -76,6 +82,7 @@ class CC_EXPORT PictureLayerTilingSet {
|
| PictureLayerTilingClient* client_;
|
| gfx::Size layer_bounds_;
|
| ScopedPtrVector<PictureLayerTiling> tilings_;
|
| + Region invalidation_;
|
|
|
| friend class Iterator;
|
| };
|
|
|