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

Unified Diff: cc/tiles/tile_manager_unittest.cc

Issue 1365793003: cc: Re-enable disabled tile manager unittests (plus fixes) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/test/fake_display_list_raster_source.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/tile_manager_unittest.cc
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc
index 8b31016dc4baf6b66a48b9c2730337a51e95a2b9..5fedc66eb57dbc8690fe6acf70a40802c1dfca50 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc
@@ -80,10 +80,12 @@ class TileManagerTilePriorityQueueTest : public testing::Test {
void SetupDefaultTrees(const gfx::Size& layer_bounds) {
scoped_refptr<FakeDisplayListRasterSource> pending_raster_source =
- FakeDisplayListRasterSource::CreateFilled(layer_bounds);
+ FakeDisplayListRasterSource::CreateFilledSolidColor(layer_bounds);
scoped_refptr<FakeDisplayListRasterSource> active_raster_source =
- FakeDisplayListRasterSource::CreateFilled(layer_bounds);
+ FakeDisplayListRasterSource::CreateFilledSolidColor(layer_bounds);
+ pending_raster_source->set_is_solid_color(false);
danakj 2015/09/28 18:26:43 Please leave a comment explaining this solid color
vmpstr 2015/09/28 20:23:20 Done.
+ active_raster_source->set_is_solid_color(false);
SetupTrees(pending_raster_source, active_raster_source);
}
@@ -1290,10 +1292,7 @@ TEST_F(TileManagerTilePriorityQueueTest,
EXPECT_TRUE(have_tiles[TilePriority::EVENTUALLY]);
}
-// TODO(vmpstr): Move these to LTHI tests, since they can't create real
-// resources and so they don't work with non-solid raster sources.
-// crbug.com/534911
-TEST_F(TileManagerTilePriorityQueueTest, DISABLED_SetIsLikelyToRequireADraw) {
+TEST_F(TileManagerTilePriorityQueueTest, SetIsLikelyToRequireADraw) {
const gfx::Size layer_bounds(1000, 1000);
host_impl_.SetViewportSize(layer_bounds);
SetupDefaultTrees(layer_bounds);
@@ -1309,11 +1308,8 @@ TEST_F(TileManagerTilePriorityQueueTest, DISABLED_SetIsLikelyToRequireADraw) {
EXPECT_TRUE(host_impl_.is_likely_to_require_a_draw());
}
-// TODO(vmpstr): Move these to LTHI tests, since they can't create real
-// resources and so they don't work with non-solid raster sources.
-// crbug.com/534911
TEST_F(TileManagerTilePriorityQueueTest,
- DISABLED_SetIsLikelyToRequireADrawOnZeroMemoryBudget) {
+ SetIsLikelyToRequireADrawOnZeroMemoryBudget) {
const gfx::Size layer_bounds(1000, 1000);
host_impl_.SetViewportSize(layer_bounds);
SetupDefaultTrees(layer_bounds);
@@ -1333,11 +1329,8 @@ TEST_F(TileManagerTilePriorityQueueTest,
EXPECT_FALSE(host_impl_.is_likely_to_require_a_draw());
}
-// TODO(vmpstr): Move these to LTHI tests, since they can't create real
-// resources and so they don't work with non-solid raster sources.
-// crbug.com/534911
TEST_F(TileManagerTilePriorityQueueTest,
- DISABLED_SetIsLikelyToRequireADrawOnLimitedMemoryBudget) {
+ SetIsLikelyToRequireADrawOnLimitedMemoryBudget) {
const gfx::Size layer_bounds(1000, 1000);
host_impl_.SetViewportSize(layer_bounds);
SetupDefaultTrees(layer_bounds);
« no previous file with comments | « cc/test/fake_display_list_raster_source.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698