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

Unified Diff: cc/resources/prioritized_tile_set_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/picture_layer_tiling.cc ('k') | cc/resources/tile.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/prioritized_tile_set_unittest.cc
diff --git a/cc/resources/prioritized_tile_set_unittest.cc b/cc/resources/prioritized_tile_set_unittest.cc
index f0a01d259007dc531ed3f6028be431917bfefa65..49b2a8f0e0463680a9173533208b97dae5895fdf 100644
--- a/cc/resources/prioritized_tile_set_unittest.cc
+++ b/cc/resources/prioritized_tile_set_unittest.cc
@@ -116,11 +116,9 @@ TEST_F(PrioritizedTileSetTest, NowAndReadyToDrawBin) {
// Ensure that tiles in NOW_AND_READY_TO_DRAW_BIN aren't sorted.
PrioritizedTileSet set;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
@@ -148,11 +146,9 @@ TEST_F(PrioritizedTileSetTest, NowBin) {
// Ensure that tiles in NOW_BIN are sorted according to BinComparator.
PrioritizedTileSet set;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
@@ -182,11 +178,9 @@ TEST_F(PrioritizedTileSetTest, SoonBin) {
// Ensure that tiles in SOON_BIN are sorted according to BinComparator.
PrioritizedTileSet set;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
@@ -217,11 +211,9 @@ TEST_F(PrioritizedTileSetTest, SoonBinNoPriority) {
// are not sorted.
PrioritizedTileSet set;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
@@ -248,11 +240,9 @@ TEST_F(PrioritizedTileSetTest, EventuallyAndActiveBin) {
// Ensure that EVENTUALLY_AND_ACTIVE_BIN tiles are sorted.
PrioritizedTileSet set;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
@@ -282,11 +272,9 @@ TEST_F(PrioritizedTileSetTest, EventuallyBin) {
// Ensure that EVENTUALLY_BIN tiles are sorted.
PrioritizedTileSet set;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
@@ -316,11 +304,9 @@ TEST_F(PrioritizedTileSetTest, AtLastAndActiveBin) {
// Ensure that AT_LAST_AND_ACTIVE_BIN tiles are sorted.
PrioritizedTileSet set;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
@@ -350,11 +336,9 @@ TEST_F(PrioritizedTileSetTest, AtLastBin) {
// Ensure that AT_LAST_BIN tiles are sorted.
PrioritizedTileSet set;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
@@ -432,11 +416,9 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) {
std::vector<scoped_refptr<Tile> > at_last_bins;
std::vector<scoped_refptr<Tile> > at_last_and_active_bins;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
PrioritizedTileSet set;
for (int priority = 0; priority < 4; ++priority) {
@@ -543,11 +525,9 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBinDisablePriority) {
std::vector<scoped_refptr<Tile> > at_last_bins;
std::vector<scoped_refptr<Tile> > at_last_and_active_bins;
- TilePriority priorities[4] = {
- TilePriorityForEventualBin(),
- TilePriorityForNowBin(),
- TilePriority(),
- TilePriorityForSoonBin()};
+ TilePriority priorities[4] = {TilePriorityForEventualBin(),
+ TilePriorityForUnoccludedNowBin(),
+ TilePriority(), TilePriorityForSoonBin()};
PrioritizedTileSet set;
for (int priority = 0; priority < 4; ++priority) {
« no previous file with comments | « cc/resources/picture_layer_tiling.cc ('k') | cc/resources/tile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698