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

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

Issue 1236533004: cc: Change max_tiles_for_interest_rect to be screen pixels padding. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 5 months 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
« no previous file with comments | « cc/tiles/picture_layer_tiling_set.h ('k') | cc/tiles/picture_layer_tiling_set_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/tiles/picture_layer_tiling_set.h" 5 #include "cc/tiles/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 15 matching lines...) Expand all
26 DCHECK_GT(float2, 0.f); 26 DCHECK_GT(float2, 0.f);
27 return float1 > float2 ? float1 / float2 : float2 / float1; 27 return float1 > float2 ? float1 / float2 : float2 / float1;
28 } 28 }
29 29
30 } // namespace 30 } // namespace
31 31
32 // static 32 // static
33 scoped_ptr<PictureLayerTilingSet> PictureLayerTilingSet::Create( 33 scoped_ptr<PictureLayerTilingSet> PictureLayerTilingSet::Create(
34 WhichTree tree, 34 WhichTree tree,
35 PictureLayerTilingClient* client, 35 PictureLayerTilingClient* client,
36 size_t max_tiles_for_interest_area, 36 size_t tiling_interest_area_padding,
37 float skewport_target_time_in_seconds, 37 float skewport_target_time_in_seconds,
38 int skewport_extrapolation_limit_in_content_pixels) { 38 int skewport_extrapolation_limit_in_content_pixels) {
39 return make_scoped_ptr(new PictureLayerTilingSet( 39 return make_scoped_ptr(new PictureLayerTilingSet(
40 tree, client, max_tiles_for_interest_area, 40 tree, client, tiling_interest_area_padding,
41 skewport_target_time_in_seconds, 41 skewport_target_time_in_seconds,
42 skewport_extrapolation_limit_in_content_pixels)); 42 skewport_extrapolation_limit_in_content_pixels));
43 } 43 }
44 44
45 PictureLayerTilingSet::PictureLayerTilingSet( 45 PictureLayerTilingSet::PictureLayerTilingSet(
46 WhichTree tree, 46 WhichTree tree,
47 PictureLayerTilingClient* client, 47 PictureLayerTilingClient* client,
48 size_t max_tiles_for_interest_area, 48 size_t tiling_interest_area_padding,
49 float skewport_target_time_in_seconds, 49 float skewport_target_time_in_seconds,
50 int skewport_extrapolation_limit_in_content_pixels) 50 int skewport_extrapolation_limit_in_content_pixels)
51 : max_tiles_for_interest_area_(max_tiles_for_interest_area), 51 : tiling_interest_area_padding_(tiling_interest_area_padding),
52 skewport_target_time_in_seconds_(skewport_target_time_in_seconds), 52 skewport_target_time_in_seconds_(skewport_target_time_in_seconds),
53 skewport_extrapolation_limit_in_content_pixels_( 53 skewport_extrapolation_limit_in_content_pixels_(
54 skewport_extrapolation_limit_in_content_pixels), 54 skewport_extrapolation_limit_in_content_pixels),
55 tree_(tree), 55 tree_(tree),
56 client_(client) { 56 client_(client) {}
57 }
58 57
59 PictureLayerTilingSet::~PictureLayerTilingSet() { 58 PictureLayerTilingSet::~PictureLayerTilingSet() {
60 } 59 }
61 60
62 void PictureLayerTilingSet::CopyTilingsAndPropertiesFromPendingTwin( 61 void PictureLayerTilingSet::CopyTilingsAndPropertiesFromPendingTwin(
63 const PictureLayerTilingSet* pending_twin_set, 62 const PictureLayerTilingSet* pending_twin_set,
64 const scoped_refptr<RasterSource>& raster_source, 63 const scoped_refptr<RasterSource>& raster_source,
65 const Region& layer_invalidation) { 64 const Region& layer_invalidation) {
66 if (pending_twin_set->tilings_.empty()) { 65 if (pending_twin_set->tilings_.empty()) {
67 // If the twin (pending) tiling set is empty, it was not updated for the 66 // If the twin (pending) tiling set is empty, it was not updated for the
68 // current frame. So we drop tilings from our set as well, instead of 67 // current frame. So we drop tilings from our set as well, instead of
69 // leaving behind unshared tilings that are all non-ideal. 68 // leaving behind unshared tilings that are all non-ideal.
70 RemoveAllTilings(); 69 RemoveAllTilings();
71 return; 70 return;
72 } 71 }
73 72
74 bool tiling_sort_required = false; 73 bool tiling_sort_required = false;
75 for (PictureLayerTiling* pending_twin_tiling : pending_twin_set->tilings_) { 74 for (PictureLayerTiling* pending_twin_tiling : pending_twin_set->tilings_) {
76 float contents_scale = pending_twin_tiling->contents_scale(); 75 float contents_scale = pending_twin_tiling->contents_scale();
77 PictureLayerTiling* this_tiling = FindTilingWithScale(contents_scale); 76 PictureLayerTiling* this_tiling = FindTilingWithScale(contents_scale);
78 if (!this_tiling) { 77 if (!this_tiling) {
79 scoped_ptr<PictureLayerTiling> new_tiling = PictureLayerTiling::Create( 78 scoped_ptr<PictureLayerTiling> new_tiling = PictureLayerTiling::Create(
80 tree_, contents_scale, raster_source, client_, 79 tree_, contents_scale, raster_source, client_,
81 max_tiles_for_interest_area_, skewport_target_time_in_seconds_, 80 tiling_interest_area_padding_, skewport_target_time_in_seconds_,
82 skewport_extrapolation_limit_in_content_pixels_); 81 skewport_extrapolation_limit_in_content_pixels_);
83 tilings_.push_back(new_tiling.Pass()); 82 tilings_.push_back(new_tiling.Pass());
84 this_tiling = tilings_.back(); 83 this_tiling = tilings_.back();
85 tiling_sort_required = true; 84 tiling_sort_required = true;
86 } 85 }
87 this_tiling->TakeTilesAndPropertiesFrom(pending_twin_tiling, 86 this_tiling->TakeTilesAndPropertiesFrom(pending_twin_tiling,
88 layer_invalidation); 87 layer_invalidation);
89 } 88 }
90 89
91 if (tiling_sort_required) 90 if (tiling_sort_required)
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 PictureLayerTiling* PictureLayerTilingSet::AddTiling( 251 PictureLayerTiling* PictureLayerTilingSet::AddTiling(
253 float contents_scale, 252 float contents_scale,
254 scoped_refptr<RasterSource> raster_source) { 253 scoped_refptr<RasterSource> raster_source) {
255 for (size_t i = 0; i < tilings_.size(); ++i) { 254 for (size_t i = 0; i < tilings_.size(); ++i) {
256 DCHECK_NE(tilings_[i]->contents_scale(), contents_scale); 255 DCHECK_NE(tilings_[i]->contents_scale(), contents_scale);
257 DCHECK_EQ(tilings_[i]->raster_source(), raster_source.get()); 256 DCHECK_EQ(tilings_[i]->raster_source(), raster_source.get());
258 } 257 }
259 258
260 tilings_.push_back(PictureLayerTiling::Create( 259 tilings_.push_back(PictureLayerTiling::Create(
261 tree_, contents_scale, raster_source, client_, 260 tree_, contents_scale, raster_source, client_,
262 max_tiles_for_interest_area_, skewport_target_time_in_seconds_, 261 tiling_interest_area_padding_, skewport_target_time_in_seconds_,
263 skewport_extrapolation_limit_in_content_pixels_)); 262 skewport_extrapolation_limit_in_content_pixels_));
264 PictureLayerTiling* appended = tilings_.back(); 263 PictureLayerTiling* appended = tilings_.back();
265 264
266 tilings_.sort(LargestToSmallestScaleFunctor()); 265 tilings_.sort(LargestToSmallestScaleFunctor());
267 return appended; 266 return appended;
268 } 267 }
269 268
270 int PictureLayerTilingSet::NumHighResTilings() const { 269 int PictureLayerTilingSet::NumHighResTilings() const {
271 return std::count_if(tilings_.begin(), tilings_.end(), 270 return std::count_if(tilings_.begin(), tilings_.end(),
272 [](PictureLayerTiling* tiling) { 271 [](PictureLayerTiling* tiling) {
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 case LOWER_THAN_LOW_RES: 583 case LOWER_THAN_LOW_RES:
585 range = TilingRange(low_res_range.end, tilings_size); 584 range = TilingRange(low_res_range.end, tilings_size);
586 break; 585 break;
587 } 586 }
588 587
589 DCHECK_LE(range.start, range.end); 588 DCHECK_LE(range.start, range.end);
590 return range; 589 return range;
591 } 590 }
592 591
593 } // namespace cc 592 } // namespace cc
OLDNEW
« no previous file with comments | « cc/tiles/picture_layer_tiling_set.h ('k') | cc/tiles/picture_layer_tiling_set_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698