| Index: cc/resources/picture_layer_tiling_set.cc
|
| diff --git a/cc/resources/picture_layer_tiling_set.cc b/cc/resources/picture_layer_tiling_set.cc
|
| index 1806ebc01c06b61ecdd318e2b7b1bdf793558c3b..96b47a66963e2cd6fbd985bd1a4ef6bd0d933975 100644
|
| --- a/cc/resources/picture_layer_tiling_set.cc
|
| +++ b/cc/resources/picture_layer_tiling_set.cc
|
| @@ -19,12 +19,8 @@ class LargestToSmallestScaleFunctor {
|
|
|
| } // namespace
|
|
|
| -
|
| -PictureLayerTilingSet::PictureLayerTilingSet(
|
| - PictureLayerTilingClient* client,
|
| - const gfx::Size& layer_bounds)
|
| - : client_(client),
|
| - layer_bounds_(layer_bounds) {
|
| +PictureLayerTilingSet::PictureLayerTilingSet(PictureLayerTilingClient* client)
|
| + : client_(client) {
|
| }
|
|
|
| PictureLayerTilingSet::~PictureLayerTilingSet() {
|
| @@ -47,7 +43,6 @@ bool PictureLayerTilingSet::SyncTilings(const PictureLayerTilingSet& other,
|
| float minimum_contents_scale) {
|
| if (new_layer_bounds.IsEmpty()) {
|
| RemoveAllTilings();
|
| - layer_bounds_ = new_layer_bounds;
|
| return false;
|
| }
|
|
|
| @@ -99,17 +94,17 @@ bool PictureLayerTilingSet::SyncTilings(const PictureLayerTilingSet& other,
|
| }
|
| tilings_.sort(LargestToSmallestScaleFunctor());
|
|
|
| - layer_bounds_ = new_layer_bounds;
|
| return have_high_res_tiling;
|
| }
|
|
|
| -PictureLayerTiling* PictureLayerTilingSet::AddTiling(float contents_scale) {
|
| +PictureLayerTiling* PictureLayerTilingSet::AddTiling(
|
| + float contents_scale,
|
| + const gfx::Size& layer_bounds) {
|
| for (size_t i = 0; i < tilings_.size(); ++i)
|
| DCHECK_NE(tilings_[i]->contents_scale(), contents_scale);
|
|
|
| - tilings_.push_back(PictureLayerTiling::Create(contents_scale,
|
| - layer_bounds_,
|
| - client_));
|
| + tilings_.push_back(
|
| + PictureLayerTiling::Create(contents_scale, layer_bounds, client_));
|
| PictureLayerTiling* appended = tilings_.back();
|
|
|
| tilings_.sort(LargestToSmallestScaleFunctor());
|
|
|