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

Unified Diff: cc/trees/quad_culler_unittest.cc

Issue 23708021: Do not clip inside OcclusionTracker. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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/trees/quad_culler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/quad_culler_unittest.cc
diff --git a/cc/trees/quad_culler_unittest.cc b/cc/trees/quad_culler_unittest.cc
index fd9db2fd0ff9d19b0404852f546b4908a8be8660..9a558787d519b390d9f28e7773abceca9097c04e 100644
--- a/cc/trees/quad_culler_unittest.cc
+++ b/cc/trees/quad_culler_unittest.cc
@@ -720,166 +720,6 @@ TEST_F(QuadCullerTest, VerifyNonAxisAlignedQuadsSafelyCulled) {
1);
}
-TEST_F(QuadCullerTest, VerifyCullOutsideScissorOverTile) {
- DECLARE_AND_INITIALIZE_TEST_QUADS();
- scoped_ptr<TiledLayerImpl> root_layer =
- MakeLayer(NULL,
- gfx::Transform(),
- root_rect,
- 1,
- true,
- gfx::Rect(),
- render_surface_layer_list);
- scoped_ptr<TiledLayerImpl> child_layer = MakeLayer(root_layer.get(),
- gfx::Transform(),
- child_rect,
- 1,
- true,
- gfx::Rect(),
- render_surface_layer_list);
- TestOcclusionTrackerImpl occlusion_tracker(gfx::Rect(200, 100, 100, 100));
- LayerIteratorType it = LayerIteratorType::Begin(&render_surface_layer_list);
-
- AppendQuads(&quad_list,
- &shared_state_list,
- child_layer.get(),
- &it,
- &occlusion_tracker);
- AppendQuads(&quad_list,
- &shared_state_list,
- root_layer.get(),
- &it,
- &occlusion_tracker);
- EXPECT_EQ(quad_list.size(), 1u);
- EXPECT_NEAR(
- occlusion_tracker.overdraw_metrics()->pixels_drawn_opaque(), 10000, 1);
- EXPECT_NEAR(
- occlusion_tracker.overdraw_metrics()->pixels_drawn_translucent(), 0, 1);
- EXPECT_NEAR(occlusion_tracker.overdraw_metrics()->pixels_culled_for_drawing(),
- 120000,
- 1);
-}
-
-TEST_F(QuadCullerTest, VerifyCullOutsideScissorOverCulledTile) {
- DECLARE_AND_INITIALIZE_TEST_QUADS();
- scoped_ptr<TiledLayerImpl> root_layer =
- MakeLayer(NULL,
- gfx::Transform(),
- root_rect,
- 1,
- true,
- gfx::Rect(),
- render_surface_layer_list);
- scoped_ptr<TiledLayerImpl> child_layer = MakeLayer(root_layer.get(),
- gfx::Transform(),
- child_rect,
- 1,
- true,
- gfx::Rect(),
- render_surface_layer_list);
- TestOcclusionTrackerImpl occlusion_tracker(gfx::Rect(100, 100, 100, 100));
- LayerIteratorType it = LayerIteratorType::Begin(&render_surface_layer_list);
-
- AppendQuads(&quad_list,
- &shared_state_list,
- child_layer.get(),
- &it,
- &occlusion_tracker);
- AppendQuads(&quad_list,
- &shared_state_list,
- root_layer.get(),
- &it,
- &occlusion_tracker);
- EXPECT_EQ(quad_list.size(), 1u);
- EXPECT_NEAR(
- occlusion_tracker.overdraw_metrics()->pixels_drawn_opaque(), 10000, 1);
- EXPECT_NEAR(
- occlusion_tracker.overdraw_metrics()->pixels_drawn_translucent(), 0, 1);
- EXPECT_NEAR(occlusion_tracker.overdraw_metrics()->pixels_culled_for_drawing(),
- 120000,
- 1);
-}
-
-TEST_F(QuadCullerTest, VerifyCullOutsideScissorOverPartialTiles) {
- DECLARE_AND_INITIALIZE_TEST_QUADS();
- scoped_ptr<TiledLayerImpl> root_layer =
- MakeLayer(NULL,
- gfx::Transform(),
- root_rect,
- 1,
- true,
- gfx::Rect(),
- render_surface_layer_list);
- scoped_ptr<TiledLayerImpl> child_layer = MakeLayer(root_layer.get(),
- gfx::Transform(),
- child_rect,
- 1,
- true,
- gfx::Rect(),
- render_surface_layer_list);
- TestOcclusionTrackerImpl occlusion_tracker(gfx::Rect(50, 50, 200, 200));
- LayerIteratorType it = LayerIteratorType::Begin(&render_surface_layer_list);
-
- AppendQuads(&quad_list,
- &shared_state_list,
- child_layer.get(),
- &it,
- &occlusion_tracker);
- AppendQuads(&quad_list,
- &shared_state_list,
- root_layer.get(),
- &it,
- &occlusion_tracker);
- EXPECT_EQ(quad_list.size(), 9u);
- EXPECT_NEAR(
- occlusion_tracker.overdraw_metrics()->pixels_drawn_opaque(), 40000, 1);
- EXPECT_NEAR(
- occlusion_tracker.overdraw_metrics()->pixels_drawn_translucent(), 0, 1);
- EXPECT_NEAR(occlusion_tracker.overdraw_metrics()->pixels_culled_for_drawing(),
- 90000,
- 1);
-}
-
-TEST_F(QuadCullerTest, VerifyCullOutsideScissorOverNoTiles) {
- DECLARE_AND_INITIALIZE_TEST_QUADS();
- scoped_ptr<TiledLayerImpl> root_layer =
- MakeLayer(NULL,
- gfx::Transform(),
- root_rect,
- 1,
- true,
- gfx::Rect(),
- render_surface_layer_list);
- scoped_ptr<TiledLayerImpl> child_layer = MakeLayer(root_layer.get(),
- gfx::Transform(),
- child_rect,
- 1,
- true,
- gfx::Rect(),
- render_surface_layer_list);
- TestOcclusionTrackerImpl occlusion_tracker(gfx::Rect(500, 500, 100, 100));
- LayerIteratorType it = LayerIteratorType::Begin(&render_surface_layer_list);
-
- AppendQuads(&quad_list,
- &shared_state_list,
- child_layer.get(),
- &it,
- &occlusion_tracker);
- AppendQuads(&quad_list,
- &shared_state_list,
- root_layer.get(),
- &it,
- &occlusion_tracker);
- EXPECT_EQ(quad_list.size(), 0u);
- EXPECT_NEAR(
- occlusion_tracker.overdraw_metrics()->pixels_drawn_opaque(), 0, 1);
- EXPECT_NEAR(
- occlusion_tracker.overdraw_metrics()->pixels_drawn_translucent(), 0, 1);
- EXPECT_NEAR(occlusion_tracker.overdraw_metrics()->pixels_culled_for_drawing(),
- 130000,
- 1);
-}
-
TEST_F(QuadCullerTest, VerifyWithoutMetrics) {
DECLARE_AND_INITIALIZE_TEST_QUADS();
scoped_ptr<TiledLayerImpl> root_layer = MakeLayer(NULL,
@@ -897,7 +737,7 @@ TEST_F(QuadCullerTest, VerifyWithoutMetrics) {
gfx::Rect(),
render_surface_layer_list);
bool record_metrics = false;
- TestOcclusionTrackerImpl occlusion_tracker(gfx::Rect(50, 50, 200, 200),
+ TestOcclusionTrackerImpl occlusion_tracker(gfx::Rect(-100, -100, 1000, 1000),
record_metrics);
LayerIteratorType it = LayerIteratorType::Begin(&render_surface_layer_list);
« no previous file with comments | « cc/trees/quad_culler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698