Chromium Code Reviews| Index: cc/layers/picture_layer_impl.cc |
| diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc |
| index 9d456fc3b65d50e0a2b54a52e098d6ecd2012d2b..b88beb0ee24df8ccce5b9c6263610cfedceb9265 100644 |
| --- a/cc/layers/picture_layer_impl.cc |
| +++ b/cc/layers/picture_layer_impl.cc |
| @@ -105,10 +105,8 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink, |
| gfx::QuadF(rect), |
| &clipped); |
| if (ShowDebugBorders()) { |
| - for (PictureLayerTilingSet::Iterator iter(tilings_.get(), |
| - contents_scale_x(), |
| - rect, |
| - ideal_contents_scale_); |
| + for (PictureLayerTilingSet::CoverageIterator iter( |
| + tilings_.get(), contents_scale_x(), rect, ideal_contents_scale_); |
| iter; |
| ++iter) { |
| SkColor color; |
| @@ -150,10 +148,8 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink, |
| // unused can be considered for removal. |
| std::vector<PictureLayerTiling*> seen_tilings; |
| - for (PictureLayerTilingSet::Iterator iter(tilings_.get(), |
| - contents_scale_x(), |
| - rect, |
| - ideal_contents_scale_); |
| + for (PictureLayerTilingSet::CoverageIterator iter( |
| + tilings_.get(), contents_scale_x(), rect, ideal_contents_scale_); |
| iter; |
| ++iter) { |
| gfx::Rect geometry_rect = iter.geometry_rect(); |
| @@ -479,7 +475,7 @@ void PictureLayerImpl::SetIsMask(bool is_mask) { |
| ResourceProvider::ResourceId PictureLayerImpl::ContentsResourceId() const { |
| gfx::Rect content_rect(content_bounds()); |
| float scale = contents_scale_x(); |
| - for (PictureLayerTilingSet::Iterator |
| + for (PictureLayerTilingSet::CoverageIterator |
| iter(tilings_.get(), scale, content_rect, ideal_contents_scale_); |
| iter; |
| ++iter) { |
| @@ -526,7 +522,8 @@ bool PictureLayerImpl::AreVisibleResourcesReady() const { |
| if (tiling->contents_scale() < min_acceptable_scale) |
| continue; |
| - for (PictureLayerTiling::Iterator iter(tiling, contents_scale_x(), rect); |
| + for (PictureLayerTiling::CoverageIterator |
|
danakj
2013/03/27 23:52:58
nit: is this wrapping super weird or is it just me
enne (OOO)
2013/03/28 17:45:07
Yeah, that is really unexpected. Filed http://b/8
|
| + iter(tiling, contents_scale_x(), rect); |
| iter; |
| ++iter) { |
| if (should_force_uploads && *iter) |