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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/picture_layer_impl_unittest.cc

Issue 1013273003: cc: Force an update on tile size after viewport resize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: attempt 3? Created 5 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
« cc/layers/picture_layer_impl.cc ('K') | « cc/layers/picture_layer_impl_perftest.cc ('k') | cc/resources/tile_manager_perftest.cc » ('j') | cc/trees/layer_tree_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 26f3be56a23caebd6f0d03a887f10974c5c2ea59..78fc4cc92a108afdd3c0cc3fa22004deecd798a8 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -128,8 +128,8 @@ class PictureLayerImplTest : public testing::Test {
active_layer_ = static_cast<FakePictureLayerImpl*>(
host_impl_.active_tree()->LayerById(id_));
- bool update_lcd_text = false;
- host_impl_.active_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.active_tree()->UpdateDrawProperties(first_update_after_commit);
}
void SetupDefaultTreesWithFixedTileSize(const gfx::Size& layer_bounds,
@@ -224,8 +224,8 @@ class PictureLayerImplTest : public testing::Test {
host_impl_.pending_tree()->LayerById(id_));
// Add tilings/tiles for the layer.
- bool update_lcd_text = false;
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
}
void SetupDrawPropertiesAndUpdateTiles(FakePictureLayerImpl* layer,
@@ -433,8 +433,8 @@ TEST_F(PictureLayerImplTest, ExternalViewportRectForPrioritizingTiles) {
viewport_rect_for_tile_priority,
transform_for_tile_priority,
resourceless_software_draw);
- bool update_lcd_text = false;
- host_impl_.active_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.active_tree()->UpdateDrawProperties(first_update_after_commit);
gfx::Rect viewport_rect_for_tile_priority_in_view_space =
viewport_rect_for_tile_priority;
@@ -468,7 +468,7 @@ TEST_F(PictureLayerImplTest, ExternalViewportRectForPrioritizingTiles) {
viewport_rect_for_tile_priority,
transform_for_tile_priority,
resourceless_software_draw);
- host_impl_.active_tree()->UpdateDrawProperties(update_lcd_text);
+ host_impl_.active_tree()->UpdateDrawProperties(first_update_after_commit);
gfx::Transform screen_to_view(gfx::Transform::kSkipInitialization);
bool success = transform_for_tile_priority.GetInverse(&screen_to_view);
@@ -606,8 +606,8 @@ TEST_F(PictureLayerImplTest, ViewportRectForTilePriorityIsCached) {
host_impl_.SetExternalDrawConstraints(
transform, viewport, viewport, viewport_rect_for_tile_priority,
transform_for_tile_priority, resourceless_software_draw);
- bool update_lcd_text = false;
- host_impl_.active_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.active_tree()->UpdateDrawProperties(first_update_after_commit);
EXPECT_EQ(viewport_rect_for_tile_priority,
active_layer_->viewport_rect_for_tile_priority_in_content_space());
@@ -625,7 +625,7 @@ TEST_F(PictureLayerImplTest, ViewportRectForTilePriorityIsCached) {
// should remain to be the previously cached value.
EXPECT_EQ(viewport_rect_for_tile_priority,
active_layer_->viewport_rect_for_tile_priority_in_content_space());
- host_impl_.active_tree()->UpdateDrawProperties(update_lcd_text);
+ host_impl_.active_tree()->UpdateDrawProperties(first_update_after_commit);
// Now the UpdateDrawProperties is called. The viewport rect for tile
// priority should be the latest value.
@@ -1316,8 +1316,8 @@ TEST_F(PictureLayerImplTest, HugeMasksGetScaledDown) {
time_ticks += base::TimeDelta::FromMilliseconds(1);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- bool update_lcd_text = false;
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
FakePictureLayerImpl* pending_mask =
static_cast<FakePictureLayerImpl*>(pending_layer_->mask_layer());
@@ -1367,7 +1367,7 @@ TEST_F(PictureLayerImplTest, HugeMasksGetScaledDown) {
time_ticks += base::TimeDelta::FromMilliseconds(1);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
// The mask tiling gets scaled down.
EXPECT_LT(pending_mask->HighResTiling()->contents_scale(), 1.f);
@@ -1423,7 +1423,7 @@ TEST_F(PictureLayerImplTest, HugeMasksGetScaledDown) {
time_ticks += base::TimeDelta::FromMilliseconds(1);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
EXPECT_EQ(0u, pending_mask->num_tilings());
}
@@ -1455,8 +1455,8 @@ TEST_F(PictureLayerImplTest, ScaledMaskLayer) {
time_ticks += base::TimeDelta::FromMilliseconds(1);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- bool update_lcd_text = false;
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
FakePictureLayerImpl* pending_mask =
static_cast<FakePictureLayerImpl*>(pending_layer_->mask_layer());
@@ -1777,8 +1777,8 @@ TEST_F(NoLowResPictureLayerImplTest,
time_ticks += base::TimeDelta::FromMilliseconds(1);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- bool update_lcd_text = false;
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
// Set visible content rect that is different from
// external_viewport_for_tile_priority.
@@ -1818,7 +1818,7 @@ TEST_F(NoLowResPictureLayerImplTest,
// Activate and draw active layer.
host_impl_.ActivateSyncTree();
- host_impl_.active_tree()->UpdateDrawProperties(update_lcd_text);
+ host_impl_.active_tree()->UpdateDrawProperties(first_update_after_commit);
active_layer_->draw_properties().visible_content_rect = visible_content_rect;
scoped_ptr<RenderPass> render_pass = RenderPass::Create();
@@ -2422,8 +2422,8 @@ TEST_F(PictureLayerImplTest, SyncTilingAfterGpuRasterizationToggles) {
time_ticks += base::TimeDelta::FromMilliseconds(1);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- bool update_lcd_text = false;
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
EXPECT_TRUE(pending_layer_->tilings()->FindTilingWithScale(1.f));
ActivateTree();
@@ -3863,8 +3863,8 @@ TEST_F(PictureLayerImplTestWithDelegatingRenderer,
SetupPendingTree(pending_pile);
pending_layer_->SetBounds(layer_bounds);
ActivateTree();
- bool update_lcd_text = false;
- host_impl_.active_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.active_tree()->UpdateDrawProperties(first_update_after_commit);
std::vector<Tile*> tiles =
active_layer_->HighResTiling()->AllTilesForTesting();
host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(tiles);
@@ -4074,8 +4074,8 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
time_ticks += base::TimeDelta::FromMilliseconds(200);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- bool update_lcd_text = false;
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
unoccluded_tile_count = 0;
queue.reset(new TilingSetRasterQueueAll(
@@ -4099,7 +4099,7 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
time_ticks += base::TimeDelta::FromMilliseconds(200);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
unoccluded_tile_count = 0;
queue.reset(new TilingSetRasterQueueAll(
@@ -4173,8 +4173,8 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
time_ticks += base::TimeDelta::FromMilliseconds(200);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- bool update_lcd_text = false;
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
for (size_t i = 0; i < pending_layer_->num_tilings(); ++i) {
PictureLayerTiling* tiling = pending_layer_->tilings()->tiling_at(i);
@@ -4214,7 +4214,7 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
time_ticks += base::TimeDelta::FromMilliseconds(200);
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
for (size_t i = 0; i < pending_layer_->num_tilings(); ++i) {
PictureLayerTiling* tiling = pending_layer_->tilings()->tiling_at(i);
@@ -4288,8 +4288,8 @@ TEST_F(OcclusionTrackingPictureLayerImplTest, OcclusionForDifferentScales) {
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
// UpdateDrawProperties with the occluding layer.
- bool update_lcd_text = false;
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
EXPECT_EQ(5u, pending_layer_->num_tilings());
@@ -4488,8 +4488,8 @@ TEST_F(OcclusionTrackingPictureLayerImplTest,
host_impl_.SetCurrentBeginFrameArgs(
CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, time_ticks));
// UpdateDrawProperties with the occluding layer.
- bool update_lcd_text = false;
- host_impl_.pending_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.pending_tree()->UpdateDrawProperties(first_update_after_commit);
// The expected number of occluded tiles on each of the 2 tilings for each of
// the 3 tree priorities.
@@ -4751,8 +4751,8 @@ TEST_F(PictureLayerImplTest, NonSolidToSolidNoTilings) {
SetupPendingTree(raster_source1);
ActivateTree();
- bool update_lcd_text = false;
- host_impl_.active_tree()->UpdateDrawProperties(update_lcd_text);
+ bool first_update_after_commit = false;
+ host_impl_.active_tree()->UpdateDrawProperties(first_update_after_commit);
// We've started with a solid layer that contains some tilings.
ASSERT_TRUE(active_layer_->tilings());
« cc/layers/picture_layer_impl.cc ('K') | « cc/layers/picture_layer_impl_perftest.cc ('k') | cc/resources/tile_manager_perftest.cc » ('j') | cc/trees/layer_tree_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698