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

Unified Diff: cc/layer_tree_host_impl_unittest.cc

Issue 11419269: cc: Give ownership of render passes to the renderer when drawing a frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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/layer_tree_host_impl.cc ('k') | cc/renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host_impl_unittest.cc
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 58e361ed2b31a7329f6e984d15184d1123061e68..b13b2a96decb2e438fe0debba3b37d5667bfe1e0 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -2413,16 +2413,15 @@ TEST_P(LayerTreeHostImplTest, contributingLayerEmptyScissorPartialSwap)
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(myHostImpl->prepareToDraw(frame));
- // Just for consistency, the most interesting stuff already happened
- myHostImpl->drawLayers(frame);
- myHostImpl->didDrawAllLayers(frame);
-
// Verify all quads have been computed
ASSERT_EQ(2U, frame.renderPasses.size());
ASSERT_EQ(1U, frame.renderPasses[0]->quad_list.size());
ASSERT_EQ(1U, frame.renderPasses[1]->quad_list.size());
EXPECT_EQ(DrawQuad::SOLID_COLOR, frame.renderPasses[0]->quad_list[0]->material);
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quad_list[0]->material);
+
+ myHostImpl->drawLayers(frame);
+ myHostImpl->didDrawAllLayers(frame);
}
}
@@ -2434,16 +2433,15 @@ TEST_P(LayerTreeHostImplTest, contributingLayerEmptyScissorNoPartialSwap)
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(myHostImpl->prepareToDraw(frame));
- // Just for consistency, the most interesting stuff already happened
- myHostImpl->drawLayers(frame);
- myHostImpl->didDrawAllLayers(frame);
-
// Verify all quads have been computed
ASSERT_EQ(2U, frame.renderPasses.size());
ASSERT_EQ(1U, frame.renderPasses[0]->quad_list.size());
ASSERT_EQ(1U, frame.renderPasses[1]->quad_list.size());
EXPECT_EQ(DrawQuad::SOLID_COLOR, frame.renderPasses[0]->quad_list[0]->material);
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quad_list[0]->material);
+
+ myHostImpl->drawLayers(frame);
+ myHostImpl->didDrawAllLayers(frame);
}
}
« no previous file with comments | « cc/layer_tree_host_impl.cc ('k') | cc/renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698