OLD | NEW |
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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 PictureLayerTiling* this_tiling = FindTilingWithScale(contents_scale); | 70 PictureLayerTiling* this_tiling = FindTilingWithScale(contents_scale); |
71 if (!this_tiling) { | 71 if (!this_tiling) { |
72 scoped_ptr<PictureLayerTiling> new_tiling = PictureLayerTiling::Create( | 72 scoped_ptr<PictureLayerTiling> new_tiling = PictureLayerTiling::Create( |
73 contents_scale, raster_source, client_, max_tiles_for_interest_area_, | 73 contents_scale, raster_source, client_, max_tiles_for_interest_area_, |
74 skewport_target_time_in_seconds_, | 74 skewport_target_time_in_seconds_, |
75 skewport_extrapolation_limit_in_content_pixels_); | 75 skewport_extrapolation_limit_in_content_pixels_); |
76 tilings_.push_back(new_tiling.Pass()); | 76 tilings_.push_back(new_tiling.Pass()); |
77 this_tiling = tilings_.back(); | 77 this_tiling = tilings_.back(); |
78 tiling_sort_required = true; | 78 tiling_sort_required = true; |
79 } | 79 } |
80 this_tiling->CloneTilesAndPropertiesFrom(*pending_twin_tiling); | 80 this_tiling->TakeTilesAndPropertiesFrom(pending_twin_tiling); |
81 } | 81 } |
82 | 82 |
83 if (tiling_sort_required) | 83 if (tiling_sort_required) |
84 tilings_.sort(LargestToSmallestScaleFunctor()); | 84 tilings_.sort(LargestToSmallestScaleFunctor()); |
85 } | 85 } |
86 | 86 |
87 void PictureLayerTilingSet::UpdateTilingsToCurrentRasterSourceForActivation( | 87 void PictureLayerTilingSet::UpdateTilingsToCurrentRasterSourceForActivation( |
88 scoped_refptr<RasterSource> raster_source, | 88 scoped_refptr<RasterSource> raster_source, |
89 const PictureLayerTilingSet* pending_twin_set, | 89 const PictureLayerTilingSet* pending_twin_set, |
90 const Region& layer_invalidation, | 90 const Region& layer_invalidation, |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 } | 139 } |
140 VerifyTilings(nullptr /* pending_twin_set */); | 140 VerifyTilings(nullptr /* pending_twin_set */); |
141 } | 141 } |
142 | 142 |
143 void PictureLayerTilingSet::UpdateRasterSourceDueToLCDChange( | 143 void PictureLayerTilingSet::UpdateRasterSourceDueToLCDChange( |
144 const scoped_refptr<RasterSource>& raster_source, | 144 const scoped_refptr<RasterSource>& raster_source, |
145 const Region& layer_invalidation) { | 145 const Region& layer_invalidation) { |
146 for (PictureLayerTiling* tiling : tilings_) { | 146 for (PictureLayerTiling* tiling : tilings_) { |
147 tiling->SetRasterSourceAndResize(raster_source); | 147 tiling->SetRasterSourceAndResize(raster_source); |
148 tiling->Invalidate(layer_invalidation); | 148 tiling->Invalidate(layer_invalidation); |
| 149 // Since the invalidation changed, we need to create any missing tiles in |
| 150 // the live tiles rect again. |
| 151 tiling->CreateMissingTilesInLiveTilesRect(); |
149 tiling->VerifyAllTilesHaveCurrentRasterSource(); | 152 tiling->VerifyAllTilesHaveCurrentRasterSource(); |
150 } | 153 } |
151 } | 154 } |
152 | 155 |
153 void PictureLayerTilingSet::VerifyTilings( | 156 void PictureLayerTilingSet::VerifyTilings( |
154 const PictureLayerTilingSet* pending_twin_set) const { | 157 const PictureLayerTilingSet* pending_twin_set) const { |
155 #if DCHECK_IS_ON() | 158 #if DCHECK_IS_ON() |
156 for (PictureLayerTiling* tiling : tilings_) { | 159 for (PictureLayerTiling* tiling : tilings_) { |
157 DCHECK(tiling->tile_size() == | 160 DCHECK(tiling->tile_size() == |
158 client_->CalculateTileSize(tiling->tiling_size())) | 161 client_->CalculateTileSize(tiling->tiling_size())) |
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 case LOWER_THAN_LOW_RES: | 587 case LOWER_THAN_LOW_RES: |
585 range = TilingRange(low_res_range.end, tilings_.size()); | 588 range = TilingRange(low_res_range.end, tilings_.size()); |
586 break; | 589 break; |
587 } | 590 } |
588 | 591 |
589 DCHECK_LE(range.start, range.end); | 592 DCHECK_LE(range.start, range.end); |
590 return range; | 593 return range; |
591 } | 594 } |
592 | 595 |
593 } // namespace cc | 596 } // namespace cc |
OLD | NEW |