Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(570)

Side by Side Diff: cc/tiles/tile_manager_unittest.cc

Issue 1236533004: cc: Change max_tiles_for_interest_rect to be screen pixels padding. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/run_loop.h" 5 #include "base/run_loop.h"
6 #include "base/thread_task_runner_handle.h" 6 #include "base/thread_task_runner_handle.h"
7 #include "cc/resources/resource_pool.h" 7 #include "cc/resources/resource_pool.h"
8 #include "cc/test/begin_frame_args_test.h" 8 #include "cc/test/begin_frame_args_test.h"
9 #include "cc/test/fake_impl_proxy.h" 9 #include "cc/test/fake_impl_proxy.h"
10 #include "cc/test/fake_layer_tree_host_impl.h" 10 #include "cc/test/fake_layer_tree_host_impl.h"
(...skipping 1143 matching lines...) Expand 10 before | Expand all | Expand 10 after
1154 1154
1155 gfx::Rect viewport(50, 50, 500, 500); 1155 gfx::Rect viewport(50, 50, 500, 500);
1156 gfx::Size layer_bounds(1600, 1600); 1156 gfx::Size layer_bounds(1600, 1600);
1157 1157
1158 float inset = PictureLayerTiling::CalculateSoonBorderDistance(viewport, 1.0f); 1158 float inset = PictureLayerTiling::CalculateSoonBorderDistance(viewport, 1.0f);
1159 gfx::Rect soon_rect = viewport; 1159 gfx::Rect soon_rect = viewport;
1160 soon_rect.Inset(-inset, -inset); 1160 soon_rect.Inset(-inset, -inset);
1161 1161
1162 client.SetTileSize(gfx::Size(30, 30)); 1162 client.SetTileSize(gfx::Size(30, 30));
1163 LayerTreeSettings settings; 1163 LayerTreeSettings settings;
1164 settings.max_tiles_for_interest_area = 10000;
weiliangc 2015/07/15 19:56:09 Like before is this removed because our default |t
vmpstr 2015/07/16 00:31:03 Yup.
1165 1164
1166 scoped_ptr<PictureLayerTilingSet> tiling_set = PictureLayerTilingSet::Create( 1165 scoped_ptr<PictureLayerTilingSet> tiling_set = PictureLayerTilingSet::Create(
1167 ACTIVE_TREE, &client, settings.max_tiles_for_interest_area, 1166 ACTIVE_TREE, &client, settings.tiling_interest_area_padding,
1168 settings.skewport_target_time_in_seconds, 1167 settings.skewport_target_time_in_seconds,
1169 settings.skewport_extrapolation_limit_in_content_pixels); 1168 settings.skewport_extrapolation_limit_in_content_pixels);
1170 1169
1171 scoped_refptr<FakePicturePileImpl> pile = 1170 scoped_refptr<FakePicturePileImpl> pile =
1172 FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds); 1171 FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds);
1173 PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, pile); 1172 PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, pile);
1174 tiling->set_resolution(HIGH_RESOLUTION); 1173 tiling->set_resolution(HIGH_RESOLUTION);
1175 1174
1176 tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true); 1175 tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true);
1177 std::vector<Tile*> all_tiles = tiling->AllTilesForTesting(); 1176 std::vector<Tile*> all_tiles = tiling->AllTilesForTesting();
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 TEST_F(TileManagerTilePriorityQueueTest, 1263 TEST_F(TileManagerTilePriorityQueueTest,
1265 RasterTilePriorityQueueMovingViewport) { 1264 RasterTilePriorityQueueMovingViewport) {
1266 FakePictureLayerTilingClient client; 1265 FakePictureLayerTilingClient client;
1267 1266
1268 gfx::Rect viewport(50, 0, 100, 100); 1267 gfx::Rect viewport(50, 0, 100, 100);
1269 gfx::Rect moved_viewport(50, 0, 100, 500); 1268 gfx::Rect moved_viewport(50, 0, 100, 500);
1270 gfx::Size layer_bounds(1000, 1000); 1269 gfx::Size layer_bounds(1000, 1000);
1271 1270
1272 client.SetTileSize(gfx::Size(30, 30)); 1271 client.SetTileSize(gfx::Size(30, 30));
1273 LayerTreeSettings settings; 1272 LayerTreeSettings settings;
1274 settings.max_tiles_for_interest_area = 10000;
1275 1273
1276 scoped_ptr<PictureLayerTilingSet> tiling_set = PictureLayerTilingSet::Create( 1274 scoped_ptr<PictureLayerTilingSet> tiling_set = PictureLayerTilingSet::Create(
1277 ACTIVE_TREE, &client, settings.max_tiles_for_interest_area, 1275 ACTIVE_TREE, &client, settings.tiling_interest_area_padding,
1278 settings.skewport_target_time_in_seconds, 1276 settings.skewport_target_time_in_seconds,
1279 settings.skewport_extrapolation_limit_in_content_pixels); 1277 settings.skewport_extrapolation_limit_in_content_pixels);
1280 1278
1281 scoped_refptr<FakePicturePileImpl> pile = 1279 scoped_refptr<FakePicturePileImpl> pile =
1282 FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds); 1280 FakePicturePileImpl::CreateFilledPileWithDefaultTileSize(layer_bounds);
1283 PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, pile); 1281 PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, pile);
1284 tiling->set_resolution(HIGH_RESOLUTION); 1282 tiling->set_resolution(HIGH_RESOLUTION);
1285 1283
1286 tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true); 1284 tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true);
1287 tiling_set->UpdateTilePriorities(moved_viewport, 1.0f, 2.0, Occlusion(), 1285 tiling_set->UpdateTilePriorities(moved_viewport, 1.0f, 2.0, Occlusion(),
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 .WillOnce(testing::Invoke([&run_loop]() { run_loop.Quit(); })); 1510 .WillOnce(testing::Invoke([&run_loop]() { run_loop.Quit(); }));
1513 host_impl_.tile_manager()->PrepareTiles(host_impl_.global_tile_state()); 1511 host_impl_.tile_manager()->PrepareTiles(host_impl_.global_tile_state());
1514 host_impl_.tile_manager()->SetMoreTilesNeedToBeRasterizedForTesting(); 1512 host_impl_.tile_manager()->SetMoreTilesNeedToBeRasterizedForTesting();
1515 EXPECT_TRUE(host_impl_.tile_manager()->HasScheduledTileTasksForTesting()); 1513 EXPECT_TRUE(host_impl_.tile_manager()->HasScheduledTileTasksForTesting());
1516 run_loop.Run(); 1514 run_loop.Run();
1517 } 1515 }
1518 } 1516 }
1519 1517
1520 } // namespace 1518 } // namespace
1521 } // namespace cc 1519 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698