Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(473)

Side by Side Diff: cc/resources/picture_layer_tiling_set.cc

Issue 775483002: cc: Remove max tiles and skewport constants from tiling client. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/picture_layer_tiling_set.h" 5 #include "cc/resources/picture_layer_tiling_set.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 11 matching lines...) Expand all
22 inline float LargerRatio(float float1, float float2) { 22 inline float LargerRatio(float float1, float float2) {
23 DCHECK_GT(float1, 0.f); 23 DCHECK_GT(float1, 0.f);
24 DCHECK_GT(float2, 0.f); 24 DCHECK_GT(float2, 0.f);
25 return float1 > float2 ? float1 / float2 : float2 / float1; 25 return float1 > float2 ? float1 / float2 : float2 / float1;
26 } 26 }
27 27
28 } // namespace 28 } // namespace
29 29
30 // static 30 // static
31 scoped_ptr<PictureLayerTilingSet> PictureLayerTilingSet::Create( 31 scoped_ptr<PictureLayerTilingSet> PictureLayerTilingSet::Create(
32 PictureLayerTilingClient* client) { 32 PictureLayerTilingClient* client,
33 return make_scoped_ptr(new PictureLayerTilingSet(client)); 33 size_t max_tiles_for_interest_area,
34 float skewport_target_time_in_seconds,
35 int skewport_extrapolation_limit_in_content_pixels) {
36 return make_scoped_ptr(new PictureLayerTilingSet(
37 client, max_tiles_for_interest_area, skewport_target_time_in_seconds,
38 skewport_extrapolation_limit_in_content_pixels));
34 } 39 }
35 40
36 PictureLayerTilingSet::PictureLayerTilingSet(PictureLayerTilingClient* client) 41 PictureLayerTilingSet::PictureLayerTilingSet(
37 : client_(client) { 42 PictureLayerTilingClient* client,
43 size_t max_tiles_for_interest_area,
44 float skewport_target_time_in_seconds,
45 int skewport_extrapolation_limit_in_content_pixels)
46 : max_tiles_for_interest_area_(max_tiles_for_interest_area),
47 skewport_target_time_in_seconds_(skewport_target_time_in_seconds),
48 skewport_extrapolation_limit_in_content_pixels_(
49 skewport_extrapolation_limit_in_content_pixels),
50 client_(client) {
38 } 51 }
39 52
40 PictureLayerTilingSet::~PictureLayerTilingSet() { 53 PictureLayerTilingSet::~PictureLayerTilingSet() {
41 } 54 }
42 55
43 void PictureLayerTilingSet::SetClient(PictureLayerTilingClient* client) { 56 void PictureLayerTilingSet::SetClient(PictureLayerTilingClient* client) {
44 client_ = client; 57 client_ = client;
45 for (size_t i = 0; i < tilings_.size(); ++i) 58 for (size_t i = 0; i < tilings_.size(); ++i)
46 tilings_[i]->SetClient(client_); 59 tilings_[i]->SetClient(client_);
47 } 60 }
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 172
160 DCHECK(this_tiling->tile_size() == 173 DCHECK(this_tiling->tile_size() ==
161 client_->CalculateTileSize(this_tiling->tiling_size())) 174 client_->CalculateTileSize(this_tiling->tiling_size()))
162 << "tile_size: " << this_tiling->tile_size().ToString() 175 << "tile_size: " << this_tiling->tile_size().ToString()
163 << " tiling_size: " << this_tiling->tiling_size().ToString() 176 << " tiling_size: " << this_tiling->tiling_size().ToString()
164 << " CalculateTileSize: " 177 << " CalculateTileSize: "
165 << client_->CalculateTileSize(this_tiling->tiling_size()).ToString(); 178 << client_->CalculateTileSize(this_tiling->tiling_size()).ToString();
166 continue; 179 continue;
167 } 180 }
168 scoped_ptr<PictureLayerTiling> new_tiling = PictureLayerTiling::Create( 181 scoped_ptr<PictureLayerTiling> new_tiling = PictureLayerTiling::Create(
169 contents_scale, 182 contents_scale, new_layer_bounds, client_, max_tiles_for_interest_area_,
170 new_layer_bounds, 183 skewport_target_time_in_seconds_,
171 client_); 184 skewport_extrapolation_limit_in_content_pixels_);
172 new_tiling->set_resolution(other.tilings_[i]->resolution()); 185 new_tiling->set_resolution(other.tilings_[i]->resolution());
173 if (new_tiling->resolution() == HIGH_RESOLUTION) 186 if (new_tiling->resolution() == HIGH_RESOLUTION)
174 have_high_res_tiling = true; 187 have_high_res_tiling = true;
175 tilings_.push_back(new_tiling.Pass()); 188 tilings_.push_back(new_tiling.Pass());
176 } 189 }
177 tilings_.sort(LargestToSmallestScaleFunctor()); 190 tilings_.sort(LargestToSmallestScaleFunctor());
178 191
179 return have_high_res_tiling; 192 return have_high_res_tiling;
180 } 193 }
181 194
182 PictureLayerTiling* PictureLayerTilingSet::AddTiling( 195 PictureLayerTiling* PictureLayerTilingSet::AddTiling(
183 float contents_scale, 196 float contents_scale,
184 const gfx::Size& layer_bounds) { 197 const gfx::Size& layer_bounds) {
185 for (size_t i = 0; i < tilings_.size(); ++i) 198 for (size_t i = 0; i < tilings_.size(); ++i)
186 DCHECK_NE(tilings_[i]->contents_scale(), contents_scale); 199 DCHECK_NE(tilings_[i]->contents_scale(), contents_scale);
187 200
188 tilings_.push_back( 201 tilings_.push_back(PictureLayerTiling::Create(
189 PictureLayerTiling::Create(contents_scale, layer_bounds, client_)); 202 contents_scale, layer_bounds, client_, max_tiles_for_interest_area_,
203 skewport_target_time_in_seconds_,
204 skewport_extrapolation_limit_in_content_pixels_));
190 PictureLayerTiling* appended = tilings_.back(); 205 PictureLayerTiling* appended = tilings_.back();
191 206
192 tilings_.sort(LargestToSmallestScaleFunctor()); 207 tilings_.sort(LargestToSmallestScaleFunctor());
193 return appended; 208 return appended;
194 } 209 }
195 210
196 int PictureLayerTilingSet::NumHighResTilings() const { 211 int PictureLayerTilingSet::NumHighResTilings() const {
197 int num_high_res = 0; 212 int num_high_res = 0;
198 for (size_t i = 0; i < tilings_.size(); ++i) { 213 for (size_t i = 0; i < tilings_.size(); ++i) {
199 if (tilings_[i]->resolution() == HIGH_RESOLUTION) 214 if (tilings_[i]->resolution() == HIGH_RESOLUTION)
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 case LOWER_THAN_LOW_RES: 533 case LOWER_THAN_LOW_RES:
519 range = TilingRange(low_res_range.end, tilings_.size()); 534 range = TilingRange(low_res_range.end, tilings_.size());
520 break; 535 break;
521 } 536 }
522 537
523 DCHECK_LE(range.start, range.end); 538 DCHECK_LE(range.start, range.end);
524 return range; 539 return range;
525 } 540 }
526 541
527 } // namespace cc 542 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698