| 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 c79923539fe12d4131c88a544d90d6b7c841646a..b973fc90b2d8ce4a06281b43b954b436382290ea 100644
|
| --- a/cc/resources/picture_layer_tiling_set.cc
|
| +++ b/cc/resources/picture_layer_tiling_set.cc
|
| @@ -218,7 +218,15 @@ Tile* PictureLayerTilingSet::CoverageIterator::operator*() const {
|
| return *tiling_iter_;
|
| }
|
|
|
| -PictureLayerTiling* PictureLayerTilingSet::CoverageIterator::CurrentTiling() {
|
| +TileResolution PictureLayerTilingSet::CoverageIterator::resolution() const {
|
| + const PictureLayerTiling* tiling = CurrentTiling();
|
| + if (tiling)
|
| + return tiling->resolution();
|
| + return NON_IDEAL_RESOLUTION;
|
| +}
|
| +
|
| +PictureLayerTiling* PictureLayerTilingSet::CoverageIterator::CurrentTiling()
|
| + const {
|
| if (current_tiling_ < 0)
|
| return NULL;
|
| if (static_cast<size_t>(current_tiling_) >= set_->tilings_.size())
|
| @@ -307,16 +315,6 @@ PictureLayerTilingSet::CoverageIterator::operator bool() const {
|
| region_iter_.has_rect();
|
| }
|
|
|
| -void PictureLayerTilingSet::DidBecomeActive() {
|
| - for (size_t i = 0; i < tilings_.size(); ++i)
|
| - tilings_[i]->DidBecomeActive();
|
| -}
|
| -
|
| -void PictureLayerTilingSet::DidBecomeRecycled() {
|
| - for (size_t i = 0; i < tilings_.size(); ++i)
|
| - tilings_[i]->DidBecomeRecycled();
|
| -}
|
| -
|
| void PictureLayerTilingSet::AsValueInto(base::debug::TracedValue* state) const {
|
| for (size_t i = 0; i < tilings_.size(); ++i) {
|
| state->BeginDictionary();
|
|
|