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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/resources/prioritized_tile_set_unittest.cc

Issue 98113005: Revert "cc: Added tile bundles" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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_unittest.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 45263416cd33b70c216bda1ab7b071e73c742ed8..b51eb0063fb5817af3aaa305d2400c00e9f3a5d2 100644
--- a/cc/resources/prioritized_tile_set_unittest.cc
+++ b/cc/resources/prioritized_tile_set_unittest.cc
@@ -8,7 +8,6 @@
#include "cc/resources/managed_tile_state.h"
#include "cc/resources/prioritized_tile_set.h"
#include "cc/resources/tile.h"
-#include "cc/resources/tile_bundle.h"
#include "cc/test/fake_output_surface.h"
#include "cc/test/fake_output_surface_client.h"
#include "cc/test/fake_picture_pile_impl.h"
@@ -79,18 +78,6 @@ class PrioritizedTileSetTest : public testing::Test {
Tile::USE_LCD_TEXT);
}
- scoped_refptr<Tile> CreateTileWithPriority(
- const TilePriority& priority) {
- scoped_refptr<TileBundle> bundle =
- tile_manager_->CreateTileBundle(0, 0, 1, 1);
- scoped_refptr<Tile> tile = CreateTile();
- bundle->AddTileAt(ACTIVE_TREE, 0, 0, tile);
- bundle->AddTileAt(PENDING_TREE, 0, 0, tile);
- bundle->SetPriority(ACTIVE_TREE, priority);
- bundle->SetPriority(PENDING_TREE, priority);
- return tile;
- }
-
private:
LayerTreeSettings settings_;
FakeOutputSurfaceClient output_surface_client_;
@@ -136,7 +123,9 @@ TEST_F(PrioritizedTileSetTest, NowAndReadyToDrawBin) {
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
tiles.push_back(tile);
set.InsertTile(tile, NOW_AND_READY_TO_DRAW_BIN);
}
@@ -166,7 +155,9 @@ TEST_F(PrioritizedTileSetTest, NowBin) {
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
tiles.push_back(tile);
set.InsertTile(tile, NOW_BIN);
}
@@ -198,7 +189,9 @@ TEST_F(PrioritizedTileSetTest, SoonBin) {
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
tiles.push_back(tile);
set.InsertTile(tile, SOON_BIN);
}
@@ -231,7 +224,9 @@ TEST_F(PrioritizedTileSetTest, SoonBinNoPriority) {
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
tiles.push_back(tile);
set.InsertTile(tile, SOON_BIN);
}
@@ -260,7 +255,9 @@ TEST_F(PrioritizedTileSetTest, EventuallyAndActiveBin) {
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
tiles.push_back(tile);
set.InsertTile(tile, EVENTUALLY_AND_ACTIVE_BIN);
}
@@ -292,7 +289,9 @@ TEST_F(PrioritizedTileSetTest, EventuallyBin) {
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
tiles.push_back(tile);
set.InsertTile(tile, EVENTUALLY_BIN);
}
@@ -324,7 +323,9 @@ TEST_F(PrioritizedTileSetTest, AtLastAndActiveBin) {
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
tiles.push_back(tile);
set.InsertTile(tile, AT_LAST_AND_ACTIVE_BIN);
}
@@ -356,7 +357,9 @@ TEST_F(PrioritizedTileSetTest, AtLastBin) {
std::vector<scoped_refptr<Tile> > tiles;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
tiles.push_back(tile);
set.InsertTile(tile, AT_LAST_BIN);
}
@@ -436,7 +439,9 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBin) {
PrioritizedTileSet set;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
now_and_ready_to_draw_bins.push_back(tile);
now_bins.push_back(tile);
@@ -545,7 +550,9 @@ TEST_F(PrioritizedTileSetTest, ManyTilesForEachBinDisablePriority) {
PrioritizedTileSet set;
for (int priority = 0; priority < 4; ++priority) {
for (int i = 0; i < 5; ++i) {
- scoped_refptr<Tile> tile = CreateTileWithPriority(priorities[priority]);
+ scoped_refptr<Tile> tile = CreateTile();
+ tile->SetPriority(ACTIVE_TREE, priorities[priority]);
+ tile->SetPriority(PENDING_TREE, priorities[priority]);
now_and_ready_to_draw_bins.push_back(tile);
now_bins.push_back(tile);
« no previous file with comments | « cc/resources/picture_layer_tiling_unittest.cc ('k') | cc/resources/tile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698