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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resources/tile_manager_unittest.cc

Issue 343463004: Move occlusion info to TilePriority. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/tile.cc ('k') | cc/resources/tile_priority.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/tile_manager_unittest.cc
diff --git a/cc/resources/tile_manager_unittest.cc b/cc/resources/tile_manager_unittest.cc
index 024ca20081d2f895f1c469e5e352947a1bec2bf2..dbcf103c335d2b87e0be0bb3cd978dc607a0e0d5 100644
--- a/cc/resources/tile_manager_unittest.cc
+++ b/cc/resources/tile_manager_unittest.cc
@@ -159,9 +159,9 @@ TEST_P(TileManagerTest, EnoughMemoryAllowAnything) {
Initialize(10, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_now =
- CreateTiles(3, TilePriorityForNowBin(), TilePriority());
+ CreateTiles(3, TilePriorityForUnoccludedNowBin(), TilePriority());
TileVector pending_now =
- CreateTiles(3, TilePriority(), TilePriorityForNowBin());
+ CreateTiles(3, TilePriority(), TilePriorityForUnoccludedNowBin());
TileVector active_pending_soon =
CreateTiles(3, TilePriorityForSoonBin(), TilePriorityForSoonBin());
TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());
@@ -180,9 +180,9 @@ TEST_P(TileManagerTest, EnoughMemoryAllowPrepaintOnly) {
Initialize(10, ALLOW_PREPAINT_ONLY, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_now =
- CreateTiles(3, TilePriorityForNowBin(), TilePriority());
+ CreateTiles(3, TilePriorityForUnoccludedNowBin(), TilePriority());
TileVector pending_now =
- CreateTiles(3, TilePriority(), TilePriorityForNowBin());
+ CreateTiles(3, TilePriority(), TilePriorityForUnoccludedNowBin());
TileVector active_pending_soon =
CreateTiles(3, TilePriorityForSoonBin(), TilePriorityForSoonBin());
TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());
@@ -201,7 +201,7 @@ TEST_P(TileManagerTest, EnoughMemoryPendingLowResAllowAbsoluteMinimum) {
Initialize(5, ALLOW_ABSOLUTE_MINIMUM, SAME_PRIORITY_FOR_BOTH_TREES);
TileVector pending_low_res =
- CreateTiles(5, TilePriority(), TilePriorityLowRes());
+ CreateTiles(5, TilePriority(), TilePriorityUnoccludedLowRes());
tile_manager()->AssignMemoryToTiles(global_state_);
@@ -214,9 +214,9 @@ TEST_P(TileManagerTest, EnoughMemoryAllowAbsoluteMinimum) {
Initialize(10, ALLOW_ABSOLUTE_MINIMUM, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_now =
- CreateTiles(3, TilePriorityForNowBin(), TilePriority());
+ CreateTiles(3, TilePriorityForUnoccludedNowBin(), TilePriority());
TileVector pending_now =
- CreateTiles(3, TilePriority(), TilePriorityForNowBin());
+ CreateTiles(3, TilePriority(), TilePriorityForUnoccludedNowBin());
TileVector active_pending_soon =
CreateTiles(3, TilePriorityForSoonBin(), TilePriorityForSoonBin());
TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());
@@ -235,9 +235,9 @@ TEST_P(TileManagerTest, EnoughMemoryAllowNothing) {
Initialize(10, ALLOW_NOTHING, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_now =
- CreateTiles(3, TilePriorityForNowBin(), TilePriority());
+ CreateTiles(3, TilePriorityForUnoccludedNowBin(), TilePriority());
TileVector pending_now =
- CreateTiles(3, TilePriority(), TilePriorityForNowBin());
+ CreateTiles(3, TilePriority(), TilePriorityForUnoccludedNowBin());
TileVector active_pending_soon =
CreateTiles(3, TilePriorityForSoonBin(), TilePriorityForSoonBin());
TileVector never_bin = CreateTiles(1, TilePriority(), TilePriority());
@@ -260,8 +260,8 @@ TEST_P(TileManagerTest, PartialOOMMemoryToPending) {
Initialize(8, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_tree_tiles =
CreateTiles(5, TilePriorityForEventualBin(), TilePriority());
- TileVector pending_tree_tiles =
- CreateTiles(5, TilePriority(), TilePriorityRequiredForActivation());
+ TileVector pending_tree_tiles = CreateTiles(
+ 5, TilePriority(), TilePriorityUnoccludedRequiredForActivation());
tile_manager()->AssignMemoryToTiles(global_state_);
EXPECT_EQ(5, AssignedMemoryCount(active_tree_tiles));
@@ -283,9 +283,9 @@ TEST_P(TileManagerTest, PartialOOMMemoryToActive) {
Initialize(8, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_tree_tiles =
- CreateTiles(5, TilePriorityForNowBin(), TilePriority());
+ CreateTiles(5, TilePriorityForUnoccludedNowBin(), TilePriority());
TileVector pending_tree_tiles =
- CreateTiles(5, TilePriority(), TilePriorityForNowBin());
+ CreateTiles(5, TilePriority(), TilePriorityForUnoccludedNowBin());
tile_manager()->AssignMemoryToTiles(global_state_);
@@ -302,8 +302,8 @@ TEST_P(TileManagerTest, TotalOOMMemoryToPending) {
Initialize(4, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_tree_tiles =
CreateTiles(10, TilePriorityForEventualBin(), TilePriority());
- TileVector pending_tree_tiles =
- CreateTiles(10, TilePriority(), TilePriorityRequiredForActivation());
+ TileVector pending_tree_tiles = CreateTiles(
+ 10, TilePriority(), TilePriorityUnoccludedRequiredForActivation());
tile_manager()->AssignMemoryToTiles(global_state_);
@@ -333,8 +333,8 @@ TEST_P(TileManagerTest, TotalOOMActiveSoonMemoryToPending) {
Initialize(4, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_tree_tiles =
CreateTiles(10, TilePriorityForSoonBin(), TilePriority());
- TileVector pending_tree_tiles =
- CreateTiles(10, TilePriority(), TilePriorityRequiredForActivation());
+ TileVector pending_tree_tiles = CreateTiles(
+ 10, TilePriority(), TilePriorityUnoccludedRequiredForActivation());
tile_manager()->AssignMemoryToTiles(global_state_);
@@ -362,9 +362,9 @@ TEST_P(TileManagerTest, TotalOOMMemoryToActive) {
Initialize(4, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_tree_tiles =
- CreateTiles(10, TilePriorityForNowBin(), TilePriority());
+ CreateTiles(10, TilePriorityForUnoccludedNowBin(), TilePriority());
TileVector pending_tree_tiles =
- CreateTiles(10, TilePriority(), TilePriorityForNowBin());
+ CreateTiles(10, TilePriority(), TilePriorityForUnoccludedNowBin());
tile_manager()->AssignMemoryToTiles(global_state_);
@@ -389,9 +389,9 @@ TEST_P(TileManagerTest, TotalOOMMemoryToNewContent) {
Initialize(8, ALLOW_ANYTHING, SMOOTHNESS_TAKES_PRIORITY);
TileVector active_tree_tiles =
- CreateTiles(10, TilePriorityForNowBin(), TilePriority());
+ CreateTiles(10, TilePriorityForUnoccludedNowBin(), TilePriority());
TileVector pending_tree_tiles =
- CreateTiles(10, TilePriority(), TilePriorityForNowBin());
+ CreateTiles(10, TilePriority(), TilePriorityForUnoccludedNowBin());
// Active tiles are required to avoid calimity. The hard-limit is used and all
// active-tiles fit. No pending tiles are needed to avoid calamity so only 10
« no previous file with comments | « cc/resources/tile.cc ('k') | cc/resources/tile_priority.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698