| Index: cc/tiles/picture_layer_tiling.h
|
| diff --git a/cc/tiles/picture_layer_tiling.h b/cc/tiles/picture_layer_tiling.h
|
| index 721f9e1e340b63f3292bb684b5181adb5848aa4c..b7127b833982ebe4f84c9072c728dda34513c566 100644
|
| --- a/cc/tiles/picture_layer_tiling.h
|
| +++ b/cc/tiles/picture_layer_tiling.h
|
| @@ -98,7 +98,7 @@ class CC_EXPORT PictureLayerTiling {
|
| float contents_scale,
|
| scoped_refptr<RasterSource> raster_source,
|
| PictureLayerTilingClient* client,
|
| - size_t max_tiles_for_interest_area,
|
| + size_t tiling_interest_area_padding,
|
| float skewport_target_time_in_seconds,
|
| int skewport_extrapolation_limit_in_content_pixels);
|
|
|
| @@ -240,22 +240,6 @@ class CC_EXPORT PictureLayerTiling {
|
| void AsValueInto(base::trace_event::TracedValue* array) const;
|
| size_t GPUMemoryUsageInBytes() const;
|
|
|
| - struct RectExpansionCache {
|
| - RectExpansionCache();
|
| -
|
| - gfx::Rect previous_start;
|
| - gfx::Rect previous_bounds;
|
| - gfx::Rect previous_result;
|
| - int64 previous_target;
|
| - };
|
| -
|
| - static
|
| - gfx::Rect ExpandRectEquallyToAreaBoundedBy(
|
| - const gfx::Rect& starting_rect,
|
| - int64 target_area,
|
| - const gfx::Rect& bounding_rect,
|
| - RectExpansionCache* cache);
|
| -
|
| protected:
|
| friend class CoverageIterator;
|
| friend class PrioritizedTile;
|
| @@ -287,7 +271,7 @@ class CC_EXPORT PictureLayerTiling {
|
| float contents_scale,
|
| scoped_refptr<RasterSource> raster_source,
|
| PictureLayerTilingClient* client,
|
| - size_t max_tiles_for_interest_area,
|
| + size_t tiling_interest_area_padding,
|
| float skewport_target_time_in_seconds,
|
| int skewport_extrapolation_limit_in_content_pixels);
|
| void SetLiveTilesRect(const gfx::Rect& live_tiles_rect);
|
| @@ -375,7 +359,7 @@ class CC_EXPORT PictureLayerTiling {
|
| }
|
| void RemoveTilesInRegion(const Region& layer_region, bool recreate_tiles);
|
|
|
| - const size_t max_tiles_for_interest_area_;
|
| + const size_t tiling_interest_area_padding_;
|
| const float skewport_target_time_in_seconds_;
|
| const int skewport_extrapolation_limit_in_content_pixels_;
|
|
|
| @@ -414,8 +398,6 @@ class CC_EXPORT PictureLayerTiling {
|
|
|
| private:
|
| DISALLOW_ASSIGN(PictureLayerTiling);
|
| -
|
| - RectExpansionCache expansion_cache_;
|
| };
|
|
|
| } // namespace cc
|
|
|