| Index: cc/tiles/picture_layer_tiling.cc
|
| diff --git a/cc/tiles/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc
|
| index c71ba04053b26f890f81574c3b79aed9589acb85..8a85b935d001fe11ff0e4ac20e9b2d23b236eb65 100644
|
| --- a/cc/tiles/picture_layer_tiling.cc
|
| +++ b/cc/tiles/picture_layer_tiling.cc
|
| @@ -381,9 +381,11 @@ PictureLayerTiling::CoverageIterator::CoverageIterator(
|
| const PictureLayerTiling* tiling,
|
| float coverage_scale,
|
| const gfx::Rect& coverage_rect)
|
| - : tiling_(tiling)
|
| - , coverage_rect_(coverage_rect)
|
| - , coverage_to_content_(ScaleTranslate2d::PreScale(tiling->raster_transform(), 1.f / coverage_scale)) {
|
| + : tiling_(tiling),
|
| + coverage_rect_(coverage_rect),
|
| + coverage_to_content_(
|
| + ScaleTranslate2d::PreScale(tiling->raster_transform(),
|
| + 1.f / coverage_scale)) {
|
| DCHECK(tiling_);
|
| // In order to avoid artifacts in geometry_rect scaling and clamping to ints,
|
| // the |coverage_scale| should always be at least as big as the tiling's
|
| @@ -413,7 +415,8 @@ PictureLayerTiling::CoverageIterator::CoverageIterator(
|
| // wanted_texels(sample coordinates) = (l:99.5, t:189.5, r:280.5, b:371.5)
|
| // Or in integer index:
|
| // wanted_texels(integer index) = (l:99, t:189, r:280, b:371)
|
| - gfx::RectF content_rect = coverage_to_content_.TransformRect(gfx::RectF(coverage_rect_));
|
| + gfx::RectF content_rect =
|
| + coverage_to_content_.TransformRect(gfx::RectF(coverage_rect_));
|
| content_rect.Offset(-0.5f, -0.5f);
|
| gfx::Rect wanted_texels = gfx::ToEnclosingRect(content_rect);
|
|
|
| @@ -943,7 +946,8 @@ size_t PictureLayerTiling::GPUMemoryUsageInBytes() const {
|
|
|
| gfx::Rect PictureLayerTiling::EnclosingContentsRectFromLayerRect(
|
| const gfx::Rect& layer_rect) const {
|
| - return ToEnclosingRect(raster_transform_.TransformRect(gfx::RectF(layer_rect)));
|
| + return ToEnclosingRect(
|
| + raster_transform_.TransformRect(gfx::RectF(layer_rect)));
|
| }
|
|
|
| gfx::Rect PictureLayerTiling::EnclosingLayerRectFromContentsRect(
|
|
|