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

Side by Side Diff: cc/layers/picture_layer_impl_unittest.cc

Issue 484363003: cc: Don't consider tiles at the layers raster_contents_scale incomplete (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: incomplete-raster-scale: fixtest Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/layers/picture_layer_impl.cc ('k') | cc/test/fake_picture_layer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/layers/picture_layer_impl.h" 5 #include "cc/layers/picture_layer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
11 11
12 #include "cc/base/math_util.h" 12 #include "cc/base/math_util.h"
13 #include "cc/layers/append_quads_data.h" 13 #include "cc/layers/append_quads_data.h"
14 #include "cc/layers/picture_layer.h" 14 #include "cc/layers/picture_layer.h"
15 #include "cc/quads/draw_quad.h" 15 #include "cc/quads/draw_quad.h"
16 #include "cc/quads/tile_draw_quad.h"
16 #include "cc/test/begin_frame_args_test.h" 17 #include "cc/test/begin_frame_args_test.h"
17 #include "cc/test/fake_content_layer_client.h" 18 #include "cc/test/fake_content_layer_client.h"
18 #include "cc/test/fake_impl_proxy.h" 19 #include "cc/test/fake_impl_proxy.h"
19 #include "cc/test/fake_layer_tree_host_impl.h" 20 #include "cc/test/fake_layer_tree_host_impl.h"
20 #include "cc/test/fake_output_surface.h" 21 #include "cc/test/fake_output_surface.h"
21 #include "cc/test/fake_picture_layer_impl.h" 22 #include "cc/test/fake_picture_layer_impl.h"
22 #include "cc/test/fake_picture_pile_impl.h" 23 #include "cc/test/fake_picture_pile_impl.h"
23 #include "cc/test/geometry_test_utils.h" 24 #include "cc/test/geometry_test_utils.h"
24 #include "cc/test/impl_side_painting_settings.h" 25 #include "cc/test/impl_side_painting_settings.h"
25 #include "cc/test/layer_test_common.h" 26 #include "cc/test/layer_test_common.h"
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 AppendQuadsData data; 1544 AppendQuadsData data;
1544 active_layer_->WillDraw(DRAW_MODE_SOFTWARE, NULL); 1545 active_layer_->WillDraw(DRAW_MODE_SOFTWARE, NULL);
1545 active_layer_->AppendQuads(render_pass.get(), occlusion_tracker, &data); 1546 active_layer_->AppendQuads(render_pass.get(), occlusion_tracker, &data);
1546 active_layer_->DidDraw(NULL); 1547 active_layer_->DidDraw(NULL);
1547 1548
1548 // All tiles in activation rect is ready to draw. 1549 // All tiles in activation rect is ready to draw.
1549 EXPECT_EQ(0u, data.num_missing_tiles); 1550 EXPECT_EQ(0u, data.num_missing_tiles);
1550 EXPECT_EQ(0u, data.num_incomplete_tiles); 1551 EXPECT_EQ(0u, data.num_incomplete_tiles);
1551 } 1552 }
1552 1553
1554 TEST_F(PictureLayerImplTest, HighResTileIsComplete) {
1555 base::TimeTicks time_ticks;
1556 time_ticks += base::TimeDelta::FromMilliseconds(1);
1557 host_impl_.SetCurrentBeginFrameArgs(
1558 CreateBeginFrameArgsForTesting(time_ticks));
1559
1560 gfx::Size tile_size(100, 100);
1561 gfx::Size layer_bounds(200, 200);
1562
1563 host_impl_.SetViewportSize(layer_bounds);
1564
1565 scoped_refptr<FakePicturePileImpl> pending_pile =
1566 FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
1567 SetupPendingTree(pending_pile);
1568 ActivateTree();
1569
1570 // All high res tiles have resources.
1571 active_layer_->set_fixed_tile_size(tile_size);
1572 host_impl_.active_tree()->UpdateDrawProperties();
1573 std::vector<Tile*> tiles =
1574 active_layer_->tilings()->tiling_at(0)->AllTilesForTesting();
1575 host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(tiles);
1576
1577 MockOcclusionTracker<LayerImpl> occlusion_tracker;
1578 scoped_ptr<RenderPass> render_pass = RenderPass::Create();
1579 AppendQuadsData data;
1580 active_layer_->WillDraw(DRAW_MODE_SOFTWARE, NULL);
1581 active_layer_->AppendQuads(render_pass.get(), occlusion_tracker, &data);
1582 active_layer_->DidDraw(NULL);
1583
1584 // All high res tiles drew, nothing was incomplete.
1585 EXPECT_EQ(9u, render_pass->quad_list.size());
1586 EXPECT_EQ(0u, data.num_missing_tiles);
1587 EXPECT_EQ(0u, data.num_incomplete_tiles);
1588 }
1589
1590 TEST_F(PictureLayerImplTest, LowResTileIsIncomplete) {
1591 base::TimeTicks time_ticks;
1592 time_ticks += base::TimeDelta::FromMilliseconds(1);
1593 host_impl_.SetCurrentBeginFrameArgs(
1594 CreateBeginFrameArgsForTesting(time_ticks));
1595
1596 gfx::Size tile_size(100, 100);
1597 gfx::Size layer_bounds(200, 200);
1598
1599 host_impl_.SetViewportSize(layer_bounds);
1600
1601 scoped_refptr<FakePicturePileImpl> pending_pile =
1602 FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
1603 SetupPendingTree(pending_pile);
1604 ActivateTree();
1605
1606 // All high res tiles have resources except one.
1607 active_layer_->set_fixed_tile_size(tile_size);
1608 host_impl_.active_tree()->UpdateDrawProperties();
1609 std::vector<Tile*> high_tiles =
1610 active_layer_->tilings()->tiling_at(0)->AllTilesForTesting();
1611 high_tiles.erase(high_tiles.begin());
1612 host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(high_tiles);
1613
1614 // All low res tiles have resources.
1615 std::vector<Tile*> low_tiles =
1616 active_layer_->tilings()->tiling_at(1)->AllTilesForTesting();
1617 host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(low_tiles);
1618
1619 MockOcclusionTracker<LayerImpl> occlusion_tracker;
1620 scoped_ptr<RenderPass> render_pass = RenderPass::Create();
1621 AppendQuadsData data;
1622 active_layer_->WillDraw(DRAW_MODE_SOFTWARE, NULL);
1623 active_layer_->AppendQuads(render_pass.get(), occlusion_tracker, &data);
1624 active_layer_->DidDraw(NULL);
1625
1626 // The missing high res tile was replaced by a low res tile.
1627 EXPECT_EQ(9u, render_pass->quad_list.size());
1628 EXPECT_EQ(0u, data.num_missing_tiles);
1629 EXPECT_EQ(1u, data.num_incomplete_tiles);
1630 }
1631
1632 TEST_F(PictureLayerImplTest,
1633 HighResAndIdealResTileIsCompleteWhenRasterScaleIsNotIdeal) {
1634 base::TimeTicks time_ticks;
1635 time_ticks += base::TimeDelta::FromMilliseconds(1);
1636 host_impl_.SetCurrentBeginFrameArgs(
1637 CreateBeginFrameArgsForTesting(time_ticks));
1638
1639 gfx::Size tile_size(100, 100);
1640 gfx::Size layer_bounds(200, 200);
1641
1642 host_impl_.SetViewportSize(layer_bounds);
1643
1644 scoped_refptr<FakePicturePileImpl> pending_pile =
1645 FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
1646 scoped_refptr<FakePicturePileImpl> active_pile =
1647 FakePicturePileImpl::CreateFilledPile(tile_size, layer_bounds);
1648 SetupTrees(pending_pile, active_pile);
1649
1650 active_layer_->set_fixed_tile_size(tile_size);
1651
1652 active_layer_->draw_properties().visible_content_rect =
1653 gfx::Rect(layer_bounds);
1654 SetupDrawPropertiesAndUpdateTiles(active_layer_, 2.f, 1.f, 1.f, 1.f, false);
1655
1656 // One ideal tile exists, this will get used when drawing.
1657 std::vector<Tile*> ideal_tiles;
1658 EXPECT_EQ(2.f, active_layer_->HighResTiling()->contents_scale());
1659 ideal_tiles.push_back(active_layer_->HighResTiling()->TileAt(0, 0));
1660 host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(
1661 ideal_tiles);
1662
1663 // Due to layer scale throttling, the raster contents scale is changed to 1,
1664 // while the ideal is still 2.
1665 SetupDrawPropertiesAndUpdateTiles(active_layer_, 1.f, 1.f, 1.f, 1.f, false);
1666 SetupDrawPropertiesAndUpdateTiles(active_layer_, 2.f, 1.f, 1.f, 1.f, false);
1667
1668 EXPECT_EQ(1.f, active_layer_->HighResTiling()->contents_scale());
1669 EXPECT_EQ(1.f, active_layer_->raster_contents_scale());
1670 EXPECT_EQ(2.f, active_layer_->ideal_contents_scale());
1671
1672 // Both tilings still exist.
1673 EXPECT_EQ(2.f, active_layer_->tilings()->tiling_at(0)->contents_scale());
1674 EXPECT_EQ(1.f, active_layer_->tilings()->tiling_at(1)->contents_scale());
1675
1676 // All high res tiles have resources.
1677 std::vector<Tile*> high_tiles =
1678 active_layer_->HighResTiling()->AllTilesForTesting();
1679 host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(high_tiles);
1680
1681 MockOcclusionTracker<LayerImpl> occlusion_tracker;
1682 scoped_ptr<RenderPass> render_pass = RenderPass::Create();
1683 AppendQuadsData data;
1684 active_layer_->WillDraw(DRAW_MODE_SOFTWARE, NULL);
1685 active_layer_->AppendQuads(render_pass.get(), occlusion_tracker, &data);
1686 active_layer_->DidDraw(NULL);
1687
1688 // All high res tiles drew, and the one ideal res tile drew.
1689 ASSERT_GT(render_pass->quad_list.size(), 9u);
1690 EXPECT_EQ(gfx::SizeF(99.f, 99.f),
1691 TileDrawQuad::MaterialCast(render_pass->quad_list[0])
1692 ->tex_coord_rect.size());
1693 EXPECT_EQ(gfx::SizeF(49.5f, 49.5f),
1694 TileDrawQuad::MaterialCast(render_pass->quad_list[1])
1695 ->tex_coord_rect.size());
1696
1697 // Neither the high res nor the ideal tiles were considered as incomplete.
1698 EXPECT_EQ(0u, data.num_missing_tiles);
1699 EXPECT_EQ(0u, data.num_incomplete_tiles);
1700 }
1701
1553 TEST_F(PictureLayerImplTest, HighResRequiredWhenUnsharedActiveAllReady) { 1702 TEST_F(PictureLayerImplTest, HighResRequiredWhenUnsharedActiveAllReady) {
1554 gfx::Size layer_bounds(400, 400); 1703 gfx::Size layer_bounds(400, 400);
1555 gfx::Size tile_size(100, 100); 1704 gfx::Size tile_size(100, 100);
1556 SetupDefaultTreesWithFixedTileSize(layer_bounds, tile_size); 1705 SetupDefaultTreesWithFixedTileSize(layer_bounds, tile_size);
1557 1706
1558 // No tiles shared. 1707 // No tiles shared.
1559 pending_layer_->set_invalidation(gfx::Rect(layer_bounds)); 1708 pending_layer_->set_invalidation(gfx::Rect(layer_bounds));
1560 1709
1561 CreateHighLowResAndSetAllTilesVisible(); 1710 CreateHighLowResAndSetAllTilesVisible();
1562 1711
(...skipping 2428 matching lines...) Expand 10 before | Expand all | Expand 10 after
3991 4140
3992 host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(all_tiles); 4141 host_impl_.tile_manager()->InitializeTilesWithResourcesForTesting(all_tiles);
3993 4142
3994 VerifyEvictionConsidersOcclusion(pending_layer_, 4143 VerifyEvictionConsidersOcclusion(pending_layer_,
3995 total_expected_occluded_tile_count); 4144 total_expected_occluded_tile_count);
3996 VerifyEvictionConsidersOcclusion(active_layer_, 4145 VerifyEvictionConsidersOcclusion(active_layer_,
3997 total_expected_occluded_tile_count); 4146 total_expected_occluded_tile_count);
3998 } 4147 }
3999 } // namespace 4148 } // namespace
4000 } // namespace cc 4149 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_layer_impl.cc ('k') | cc/test/fake_picture_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698