| 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 51896a5b5f7f29cfb287e970fb8b301aaa4b83a0..9d76f5fef6095a4be8009f6cf981161c6ee620aa 100644
|
| --- a/cc/resources/picture_layer_tiling_set.cc
|
| +++ b/cc/resources/picture_layer_tiling_set.cc
|
| @@ -29,12 +29,23 @@ inline float LargerRatio(float float1, float float2) {
|
|
|
| // static
|
| scoped_ptr<PictureLayerTilingSet> PictureLayerTilingSet::Create(
|
| - PictureLayerTilingClient* client) {
|
| - return make_scoped_ptr(new PictureLayerTilingSet(client));
|
| + PictureLayerTilingClient* client,
|
| + size_t max_tiles_for_interest_area,
|
| + float skewport_target_time_in_seconds,
|
| + int skewport_extrapolation_limit_in_content) {
|
| + auto set = make_scoped_ptr(new PictureLayerTilingSet(client));
|
| + set->SetMaxTilesForInterestArea(max_tiles_for_interest_area);
|
| + set->SetSkewportTargetTimeInSeconds(skewport_target_time_in_seconds);
|
| + set->SetSkewportExtrapolationLimitInContentPixels(
|
| + skewport_extrapolation_limit_in_content);
|
| + return set;
|
| }
|
|
|
| PictureLayerTilingSet::PictureLayerTilingSet(PictureLayerTilingClient* client)
|
| - : client_(client) {
|
| + : max_tiles_for_interest_area_(0u),
|
| + skewport_target_time_in_seconds_(0.f),
|
| + skewport_extrapolation_limit_in_content_pixels_(0),
|
| + client_(client) {
|
| }
|
|
|
| PictureLayerTilingSet::~PictureLayerTilingSet() {
|
| @@ -166,9 +177,9 @@ bool PictureLayerTilingSet::SyncTilings(const PictureLayerTilingSet& other,
|
| continue;
|
| }
|
| scoped_ptr<PictureLayerTiling> new_tiling = PictureLayerTiling::Create(
|
| - contents_scale,
|
| - new_layer_bounds,
|
| - client_);
|
| + contents_scale, new_layer_bounds, client_, max_tiles_for_interest_area_,
|
| + skewport_target_time_in_seconds_,
|
| + skewport_extrapolation_limit_in_content_pixels_);
|
| new_tiling->set_resolution(other.tilings_[i]->resolution());
|
| if (new_tiling->resolution() == HIGH_RESOLUTION)
|
| have_high_res_tiling = true;
|
| @@ -185,8 +196,10 @@ PictureLayerTiling* PictureLayerTilingSet::AddTiling(
|
| 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_, max_tiles_for_interest_area_,
|
| + skewport_target_time_in_seconds_,
|
| + skewport_extrapolation_limit_in_content_pixels_));
|
| PictureLayerTiling* appended = tilings_.back();
|
|
|
| tilings_.sort(LargestToSmallestScaleFunctor());
|
|
|