Index: cc/resources/picture_layer_tiling_perftest.cc |
diff --git a/cc/resources/picture_layer_tiling_perftest.cc b/cc/resources/picture_layer_tiling_perftest.cc |
index 3944e4698dc92fa6a4144d04083ff3402ad64f49..ee41bef70b82e1a0e05751e3c8cdcf71e8de5b7e 100644 |
--- a/cc/resources/picture_layer_tiling_perftest.cc |
+++ b/cc/resources/picture_layer_tiling_perftest.cc |
@@ -44,11 +44,14 @@ class PictureLayerTilingPerfTest : public testing::Test { |
} |
void SetUp() override { |
+ LayerTreeSettings defaults; |
picture_layer_tiling_client_.SetTileSize(gfx::Size(256, 256)); |
- picture_layer_tiling_client_.set_max_tiles_for_interest_area(250); |
picture_layer_tiling_client_.set_tree(PENDING_TREE); |
picture_layer_tiling_ = PictureLayerTiling::Create( |
- 1, gfx::Size(256 * 50, 256 * 50), &picture_layer_tiling_client_); |
+ 1, gfx::Size(256 * 50, 256 * 50), &picture_layer_tiling_client_, |
+ defaults.max_tiles_for_interest_area, |
+ defaults.skewport_target_time_in_seconds, |
+ defaults.skewport_extrapolation_limit_in_content_pixels); |
picture_layer_tiling_->CreateAllTilesForTesting(); |
} |
@@ -57,9 +60,7 @@ class PictureLayerTilingPerfTest : public testing::Test { |
void RunInvalidateTest(const std::string& test_name, const Region& region) { |
timer_.Reset(); |
do { |
- picture_layer_tiling_->UpdateTilesToCurrentRasterSource( |
- picture_layer_tiling_client_.raster_source(), region, |
- picture_layer_tiling_->tiling_size()); |
+ picture_layer_tiling_->Invalidate(region); |
timer_.NextLap(); |
} while (!timer_.HasTimeLimitExpired()); |
@@ -126,8 +127,12 @@ class PictureLayerTilingPerfTest : public testing::Test { |
void RunRasterIteratorConstructTest(const std::string& test_name, |
const gfx::Rect& viewport) { |
gfx::Size bounds(viewport.size()); |
- picture_layer_tiling_ = |
- PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_); |
+ LayerTreeSettings defaults; |
+ picture_layer_tiling_ = PictureLayerTiling::Create( |
+ 1, bounds, &picture_layer_tiling_client_, |
+ defaults.max_tiles_for_interest_area, |
+ defaults.skewport_target_time_in_seconds, |
+ defaults.skewport_extrapolation_limit_in_content_pixels); |
picture_layer_tiling_client_.set_tree(ACTIVE_TREE); |
picture_layer_tiling_->ComputeTilePriorityRects(viewport, 1.0f, 1.0, |
Occlusion()); |
@@ -151,8 +156,12 @@ class PictureLayerTilingPerfTest : public testing::Test { |
int num_tiles, |
const gfx::Rect& viewport) { |
gfx::Size bounds(10000, 10000); |
- picture_layer_tiling_ = |
- PictureLayerTiling::Create(1, bounds, &picture_layer_tiling_client_); |
+ LayerTreeSettings defaults; |
+ picture_layer_tiling_ = PictureLayerTiling::Create( |
+ 1, bounds, &picture_layer_tiling_client_, |
+ defaults.max_tiles_for_interest_area, |
+ defaults.skewport_target_time_in_seconds, |
+ defaults.skewport_extrapolation_limit_in_content_pixels); |
picture_layer_tiling_client_.set_tree(ACTIVE_TREE); |
picture_layer_tiling_->ComputeTilePriorityRects(viewport, 1.0f, 1.0, |
Occlusion()); |