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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/tiles/tile_manager_unittest.cc

Issue 2175553002: Raster PictureLayerTiling with fractional translation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: combined Created 3 years, 9 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 5a849477951755fe2526856e19628f50b31b89e3..f1a619798c8ebf42bf3d97e9c4653c3daded9e15 100644
--- a/cc/tiles/tile_manager_unittest.cc
+++ b/cc/tiles/tile_manager_unittest.cc
@@ -354,10 +354,16 @@ 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(
+ ScaleTranslate2d(1.5f, gfx::Vector2dF()),
+ pending_layer()->raster_source());
+ active_layer()->tilings()->AddTiling(ScaleTranslate2d(1.5f, gfx::Vector2dF()),
+ active_layer()->raster_source());
+ pending_layer()->tilings()->AddTiling(
+ ScaleTranslate2d(1.7f, gfx::Vector2dF()),
+ pending_layer()->raster_source());
+ active_layer()->tilings()->AddTiling(ScaleTranslate2d(1.7f, gfx::Vector2dF()),
+ active_layer()->raster_source());
pending_layer()->tilings()->UpdateTilePriorities(gfx::Rect(viewport), 1.f,
5.0, Occlusion(), true);
@@ -367,7 +373,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());
@@ -378,7 +384,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());
@@ -386,7 +392,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)
@@ -421,10 +427,16 @@ 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(
+ ScaleTranslate2d(1.5f, gfx::Vector2dF()),
+ pending_layer()->raster_source());
+ active_layer()->tilings()->AddTiling(ScaleTranslate2d(1.5f, gfx::Vector2dF()),
+ active_layer()->raster_source());
+ pending_layer()->tilings()->AddTiling(
+ ScaleTranslate2d(1.7f, gfx::Vector2dF()),
+ pending_layer()->raster_source());
+ active_layer()->tilings()->AddTiling(ScaleTranslate2d(1.7f, gfx::Vector2dF()),
+ active_layer()->raster_source());
pending_layer()->tilings()->UpdateTilePriorities(gfx::Rect(viewport), 1.f,
5.0, Occlusion(), true);
@@ -434,7 +446,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());
@@ -445,7 +457,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());
@@ -453,7 +465,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)
@@ -911,8 +923,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;
@@ -1134,7 +1146,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(ScaleTranslate2d(), raster_source);
tiling->set_resolution(HIGH_RESOLUTION);
tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true);
@@ -1245,7 +1258,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(ScaleTranslate2d(), raster_source);
tiling->set_resolution(HIGH_RESOLUTION);
tiling_set->UpdateTilePriorities(viewport, 1.0f, 1.0, Occlusion(), true);
@@ -1401,7 +1415,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(ScaleTranslate2d(), raster_source);
tiling->set_resolution(HIGH_RESOLUTION);
tiling->CreateAllTilesForTesting();
@@ -1477,7 +1491,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(ScaleTranslate2d(), raster_source);
tiling->set_resolution(HIGH_RESOLUTION);
tiling->CreateAllTilesForTesting();
tiling->SetTilePriorityRectsForTesting(
@@ -1680,7 +1695,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(ScaleTranslate2d(), raster);
tiling->set_resolution(resolutions[i]);
tiling->CreateAllTilesForTesting();
tiling->SetTilePriorityRectsForTesting(
@@ -1987,7 +2002,7 @@ class MockReadyToDrawRasterBufferProviderImpl
const gfx::Rect& raster_full_rect,
const gfx::Rect& raster_dirty_rect,
uint64_t new_content_id,
- float scale,
+ const ScaleTranslate2d& transform,
const RasterSource::PlaybackSettings& playback_settings) override {}
};
};
@@ -2362,7 +2377,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(ScaleTranslate2d(), 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