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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/tiles/tile_manager_unittest.cc

Issue 2566613002: [4/5] Add translated rasterization support for PictureLayerTilingSet & below (Closed)
Patch Set: still need that rebaseline Created 3 years, 8 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/tiles/tile_manager.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | 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 59e73f36579eb7ae0ea40902783ae4da50090d95..b410cc006afbee128f9eea77e880ece3d2c632e1 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc
@@ -356,10 +356,18 @@ TEST_F(TileManagerTilePriorityQueueTest,
host_impl()->SetViewportSize(viewport);
SetupDefaultTrees(layer_bounds);
- pending_layer()->tilings()->AddTiling(1.5f, pending_layer()->raster_source());
- active_layer()->tilings()->AddTiling(1.5f, active_layer()->raster_source());
- pending_layer()->tilings()->AddTiling(1.7f, pending_layer()->raster_source());
- active_layer()->tilings()->AddTiling(1.7f, active_layer()->raster_source());
+ pending_layer()->tilings()->AddTiling(
+ gfx::AxisTransform2d(1.5f, gfx::Vector2dF()),
+ pending_layer()->raster_source());
+ active_layer()->tilings()->AddTiling(
+ gfx::AxisTransform2d(1.5f, gfx::Vector2dF()),
+ active_layer()->raster_source());
+ pending_layer()->tilings()->AddTiling(
+ gfx::AxisTransform2d(1.7f, gfx::Vector2dF()),
+ pending_layer()->raster_source());
+ active_layer()->tilings()->AddTiling(
+ gfx::AxisTransform2d(1.7f, gfx::Vector2dF()),
+ active_layer()->raster_source());
pending_layer()->tilings()->UpdateTilePriorities(gfx::Rect(viewport), 1.f,
5.0, Occlusion(), true);
@@ -369,7 +377,7 @@ TEST_F(TileManagerTilePriorityQueueTest,
std::set<Tile*> all_expected_tiles;
for (size_t i = 0; i < pending_layer()->num_tilings(); ++i) {
PictureLayerTiling* tiling = pending_layer()->tilings()->tiling_at(i);
- if (tiling->contents_scale() == 1.f) {
+ if (tiling->contents_scale_key() == 1.f) {
tiling->set_resolution(HIGH_RESOLUTION);
const auto& all_tiles = tiling->AllTilesForTesting();
all_expected_tiles.insert(all_tiles.begin(), all_tiles.end());
@@ -380,7 +388,7 @@ TEST_F(TileManagerTilePriorityQueueTest,
for (size_t i = 0; i < active_layer()->num_tilings(); ++i) {
PictureLayerTiling* tiling = active_layer()->tilings()->tiling_at(i);
- if (tiling->contents_scale() == 1.5f) {
+ if (tiling->contents_scale_key() == 1.5f) {
tiling->set_resolution(HIGH_RESOLUTION);
const auto& all_tiles = tiling->AllTilesForTesting();
all_expected_tiles.insert(all_tiles.begin(), all_tiles.end());
@@ -388,7 +396,7 @@ TEST_F(TileManagerTilePriorityQueueTest,
tiling->set_resolution(NON_IDEAL_RESOLUTION);
// Non ideal tilings with a high res pending twin have to be processed
// because of possible activation tiles.
- if (tiling->contents_scale() == 1.f) {
+ if (tiling->contents_scale_key() == 1.f) {
tiling->UpdateAndGetAllPrioritizedTilesForTesting();
const auto& all_tiles = tiling->AllTilesForTesting();
for (auto* tile : all_tiles)
@@ -423,10 +431,18 @@ TEST_F(TileManagerTilePriorityQueueTest,
host_impl()->SetViewportSize(viewport);
SetupDefaultTrees(layer_bounds);
- pending_layer()->tilings()->AddTiling(1.5f, pending_layer()->raster_source());
- active_layer()->tilings()->AddTiling(1.5f, active_layer()->raster_source());
- pending_layer()->tilings()->AddTiling(1.7f, pending_layer()->raster_source());
- active_layer()->tilings()->AddTiling(1.7f, active_layer()->raster_source());
+ pending_layer()->tilings()->AddTiling(
+ gfx::AxisTransform2d(1.5f, gfx::Vector2dF()),
+ pending_layer()->raster_source());
+ active_layer()->tilings()->AddTiling(
+ gfx::AxisTransform2d(1.5f, gfx::Vector2dF()),
+ active_layer()->raster_source());
+ pending_layer()->tilings()->AddTiling(
+ gfx::AxisTransform2d(1.7f, gfx::Vector2dF()),
+ pending_layer()->raster_source());
+ active_layer()->tilings()->AddTiling(
+ gfx::AxisTransform2d(1.7f, gfx::Vector2dF()),
+ active_layer()->raster_source());
pending_layer()->tilings()->UpdateTilePriorities(gfx::Rect(viewport), 1.f,
5.0, Occlusion(), true);
@@ -436,7 +452,7 @@ TEST_F(TileManagerTilePriorityQueueTest,
std::set<Tile*> all_expected_tiles;
for (size_t i = 0; i < pending_layer()->num_tilings(); ++i) {
PictureLayerTiling* tiling = pending_layer()->tilings()->tiling_at(i);
- if (tiling->contents_scale() == 1.f) {
+ if (tiling->contents_scale_key() == 1.f) {
tiling->set_resolution(HIGH_RESOLUTION);
const auto& all_tiles = tiling->AllTilesForTesting();
all_expected_tiles.insert(all_tiles.begin(), all_tiles.end());
@@ -447,7 +463,7 @@ TEST_F(TileManagerTilePriorityQueueTest,
for (size_t i = 0; i < active_layer()->num_tilings(); ++i) {
PictureLayerTiling* tiling = active_layer()->tilings()->tiling_at(i);
- if (tiling->contents_scale() == 1.5f) {
+ if (tiling->contents_scale_key() == 1.5f) {
tiling->set_resolution(HIGH_RESOLUTION);
const auto& all_tiles = tiling->AllTilesForTesting();
all_expected_tiles.insert(all_tiles.begin(), all_tiles.end());
@@ -455,7 +471,7 @@ TEST_F(TileManagerTilePriorityQueueTest,
tiling->set_resolution(LOW_RESOLUTION);
// Low res tilings with a high res pending twin have to be processed
// because of possible activation tiles.
- if (tiling->contents_scale() == 1.f) {
+ if (tiling->contents_scale_key() == 1.f) {
tiling->UpdateAndGetAllPrioritizedTilesForTesting();
const auto& all_tiles = tiling->AllTilesForTesting();
for (auto* tile : all_tiles)
@@ -913,8 +929,8 @@ TEST_F(TileManagerTilePriorityQueueTest,
EXPECT_TRUE((tile_priority_bin < last_tile_priority_bin) ||
prioritized_tile.tile()->required_for_activation() ||
- (prioritized_tile.tile()->contents_scale() !=
- last_tile.tile()->contents_scale()));
+ (prioritized_tile.tile()->raster_transform() !=
+ last_tile.tile()->raster_transform()));
}
}
last_tile = prioritized_tile;
@@ -1135,7 +1151,8 @@ TEST_F(TileManagerTilePriorityQueueTest,
scoped_refptr<FakeRasterSource> raster_source =
FakeRasterSource::CreateFilled(layer_bounds);
- PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, raster_source);
+ PictureLayerTiling* tiling =
+ tiling_set->AddTiling(gfx::AxisTransform2d(), raster_source);
tiling->set_resolution(HIGH_RESOLUTION);
tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true);
@@ -1246,7 +1263,8 @@ TEST_F(TileManagerTilePriorityQueueTest,
scoped_refptr<FakeRasterSource> raster_source =
FakeRasterSource::CreateFilled(layer_bounds);
- PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, raster_source);
+ PictureLayerTiling* tiling =
+ tiling_set->AddTiling(gfx::AxisTransform2d(), raster_source);
tiling->set_resolution(HIGH_RESOLUTION);
tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true);
@@ -1402,7 +1420,7 @@ TEST_F(TileManagerTilePriorityQueueTest, RasterQueueAllUsesCorrectTileBounds) {
1.0f, 1.0f, 1000, 1000.f);
pending_client.set_twin_tiling_set(tiling_set.get());
- auto* tiling = tiling_set->AddTiling(1.0f, raster_source);
+ auto* tiling = tiling_set->AddTiling(gfx::AxisTransform2d(), raster_source);
tiling->set_resolution(HIGH_RESOLUTION);
tiling->CreateAllTilesForTesting();
@@ -1478,7 +1496,8 @@ TEST_F(TileManagerTilePriorityQueueTest, NoRasterTasksforSolidColorTiles) {
layer_impl->set_is_drawn_render_surface_layer_list_member(true);
PictureLayerTilingSet* tiling_set = layer_impl->picture_layer_tiling_set();
- PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, raster_source);
+ PictureLayerTiling* tiling =
+ tiling_set->AddTiling(gfx::AxisTransform2d(), raster_source);
tiling->set_resolution(HIGH_RESOLUTION);
tiling->CreateAllTilesForTesting();
tiling->SetTilePriorityRectsForTesting(
@@ -1681,7 +1700,7 @@ TEST_F(TileManagerTest, LowResHasNoImage) {
PictureLayerTilingSet* tiling_set = layer->picture_layer_tiling_set();
layer->set_is_drawn_render_surface_layer_list_member(true);
- auto* tiling = tiling_set->AddTiling(1.0f, raster);
+ auto* tiling = tiling_set->AddTiling(gfx::AxisTransform2d(), raster);
tiling->set_resolution(resolutions[i]);
tiling->CreateAllTilesForTesting();
tiling->SetTilePriorityRectsForTesting(
@@ -2363,7 +2382,8 @@ TEST_F(CheckerImagingTileManagerTest,
layer_impl->set_is_drawn_render_surface_layer_list_member(true);
PictureLayerTilingSet* tiling_set = layer_impl->picture_layer_tiling_set();
- PictureLayerTiling* tiling = tiling_set->AddTiling(1.0f, raster_source);
+ PictureLayerTiling* tiling =
+ tiling_set->AddTiling(gfx::AxisTransform2d(), raster_source);
tiling->set_resolution(HIGH_RESOLUTION);
tiling->CreateAllTilesForTesting();
tiling->SetTilePriorityRectsForTesting(
« no previous file with comments | « cc/tiles/tile_manager.cc ('k') | cc/trees/layer_tree_host_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698