| Index: cc/picture_layer_impl.h
|
| diff --git a/cc/picture_layer_impl.h b/cc/picture_layer_impl.h
|
| index 60e2c8d34a4b140430c5d5aa4e271d1518b517f6..416b2becb11021555130e38672c5a9573dfa0121 100644
|
| --- a/cc/picture_layer_impl.h
|
| +++ b/cc/picture_layer_impl.h
|
| @@ -50,10 +50,11 @@ public:
|
|
|
| protected:
|
| PictureLayerImpl(LayerTreeImpl* treeImpl, int id);
|
| - void AddTiling(float contents_scale, gfx::Size tile_size);
|
| + PictureLayerTiling* AddTiling(float contents_scale);
|
| void SyncFromActiveLayer(const PictureLayerImpl* other);
|
| gfx::Size TileSize() const;
|
| void ManageTilings(float ideal_contents_scale);
|
| + void CleanUpUnusedTilings(std::vector<PictureLayerTiling*> used_tilings);
|
|
|
| PictureLayerTilingSet tilings_;
|
| scoped_refptr<PicturePileImpl> pile_;
|
| @@ -63,8 +64,8 @@ protected:
|
| double last_update_time_;
|
| gfx::Size last_bounds_;
|
| gfx::Size last_content_bounds_;
|
| - float last_content_scale_x_;
|
| - float last_content_scale_y_;
|
| + float last_content_scale_;
|
| + float ideal_contents_scale_;
|
| bool is_mask_;
|
|
|
| friend class PictureLayer;
|
|
|