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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/delegated_renderer_layer_impl_unittest.cc

Issue 448303002: Use custom ListContainer to allocate DrawQuads (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@perftest
Patch Set: fix win trybot compile error Created 6 years, 3 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/layers/delegated_renderer_layer_impl.cc ('k') | cc/layers/nine_patch_layer_impl_unittest.cc » ('j') | cc/output/direct_renderer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/delegated_renderer_layer_impl_unittest.cc
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index ee65ed3b82f5f83b3efb3a08004894c1cad1c80e..2475122392fd8d4b544e630c71aaff7fba4c7e34 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -189,17 +189,17 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
// contributing RenderPasses.
ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
- frame.render_passes[1]->quad_list[0]->rect.ToString());
+ frame.render_passes[1]->quad_list.front()->rect.ToString());
// Verify it added the right quads.
ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
- EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(),
- frame.render_passes[2]->quad_list[0]->rect.ToString());
- EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(),
- frame.render_passes[2]->quad_list[1]->rect.ToString());
+ QuadList::ConstIterator iter = frame.render_passes[2]->quad_list.begin();
+ EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(), iter->rect.ToString());
+ ++iter;
+ EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), iter->rect.ToString());
ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
- frame.render_passes[1]->quad_list[0]->rect.ToString());
+ frame.render_passes[1]->quad_list.front()->rect.ToString());
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
host_impl_->DidDrawAllLayers(frame);
@@ -220,13 +220,13 @@ TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) {
// RenderPass to its target RenderPass. The layer_after_ also adds one quad.
ASSERT_EQ(2u, frame.render_passes[3]->quad_list.size());
+ QuadList::ConstIterator iter = frame.render_passes[3]->quad_list.begin();
// Verify it added the right quads.
- EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
- frame.render_passes[3]->quad_list[0]->rect.ToString());
+ EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(), iter->rect.ToString());
+ ++iter;
// Its target layer should have a quad as well.
- EXPECT_EQ(gfx::Rect(0, 0, 15, 15).ToString(),
- frame.render_passes[3]->quad_list[1]->rect.ToString());
+ EXPECT_EQ(gfx::Rect(0, 0, 15, 15).ToString(), iter->rect.ToString());
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
host_impl_->DidDrawAllLayers(frame);
@@ -247,17 +247,19 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
gfx::Transform transform;
transform.Translate(4.0, 4.0);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- transform, frame.render_passes[3]->quad_list[0]->quadTransform());
+ transform, frame.render_passes[3]->quad_list.front()->quadTransform());
// Quads from non-root RenderPasses should not be shifted though.
ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
- EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.render_passes[2]->quad_list[0]->quadTransform());
- EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.render_passes[2]->quad_list[1]->quadTransform());
+
+ QuadList::ConstIterator iter = frame.render_passes[2]->quad_list.begin();
+ EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), iter->quadTransform());
+ ++iter;
+ EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), iter->quadTransform());
ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform());
+ gfx::Transform(),
+ frame.render_passes[1]->quad_list.front()->quadTransform());
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
host_impl_->DidDrawAllLayers(frame);
@@ -412,17 +414,18 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface,
// contributing RenderPasses.
ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
- frame.render_passes[1]->quad_list[0]->rect.ToString());
+ frame.render_passes[1]->quad_list.front()->rect.ToString());
// Verify it added the right quads.
ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
- EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(),
- frame.render_passes[2]->quad_list[0]->rect.ToString());
- EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(),
- frame.render_passes[2]->quad_list[1]->rect.ToString());
+
+ QuadList::ConstIterator iter = frame.render_passes[2]->quad_list.begin();
+ EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(), iter->rect.ToString());
+ ++iter;
+ EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(), iter->rect.ToString());
ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
- frame.render_passes[1]->quad_list[0]->rect.ToString());
+ frame.render_passes[1]->quad_list.front()->rect.ToString());
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
host_impl_->DidDrawAllLayers(frame);
@@ -447,7 +450,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) {
// Verify it added the right quads.
EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
- frame.render_passes[3]->quad_list[0]->rect.ToString());
+ frame.render_passes[3]->quad_list.front()->rect.ToString());
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
host_impl_->DidDrawAllLayers(frame);
@@ -466,17 +469,20 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface,
// Because the DelegatedRendererLayer owns a RenderSurfaceImpl, its root
// RenderPass' quads do not need to be translated at all.
EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.render_passes[3]->quad_list[0]->quadTransform());
+ gfx::Transform(),
+ frame.render_passes[3]->quad_list.front()->quadTransform());
// Quads from non-root RenderPasses should not be shifted either.
ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
- EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.render_passes[2]->quad_list[0]->quadTransform());
- EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.render_passes[2]->quad_list[1]->quadTransform());
+
+ QuadList::ConstIterator iter = frame.render_passes[2]->quad_list.begin();
+ EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), iter->quadTransform());
danakj 2014/09/23 17:59:38 WDYT of adding ElementAt(size_t pos) to get at an
weiliangc 2014/09/24 20:14:35 Add at(index) function as well as unittest.
+ ++iter;
+ EXPECT_TRANSFORMATION_MATRIX_EQ(gfx::Transform(), iter->quadTransform());
ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform());
+ gfx::Transform(),
+ frame.render_passes[1]->quad_list.front()->quadTransform());
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
host_impl_->DidDrawAllLayers(frame);
@@ -649,21 +655,21 @@ class DelegatedRendererLayerImplTestTransform
ASSERT_EQ(5u, root_delegated_quad_list.size());
// All quads in a render pass should share the same state.
- *contrib_delegated_shared_quad_state =
- contrib_delegated_quad_list[0]->shared_quad_state;
- EXPECT_EQ(*contrib_delegated_shared_quad_state,
- contrib_delegated_quad_list[1]->shared_quad_state);
+ QuadList::ConstIterator iter = contrib_delegated_quad_list.begin();
+ *contrib_delegated_shared_quad_state = iter->shared_quad_state;
+ ++iter;
+ EXPECT_EQ(*contrib_delegated_shared_quad_state, iter->shared_quad_state);
- *root_delegated_shared_quad_state =
- root_delegated_quad_list[0]->shared_quad_state;
- EXPECT_EQ(*root_delegated_shared_quad_state,
- root_delegated_quad_list[1]->shared_quad_state);
- EXPECT_EQ(*root_delegated_shared_quad_state,
- root_delegated_quad_list[2]->shared_quad_state);
- EXPECT_EQ(*root_delegated_shared_quad_state,
- root_delegated_quad_list[3]->shared_quad_state);
- EXPECT_EQ(*root_delegated_shared_quad_state,
- root_delegated_quad_list[4]->shared_quad_state);
+ iter = root_delegated_quad_list.begin();
+ *root_delegated_shared_quad_state = iter->shared_quad_state;
+ ++iter;
+ EXPECT_EQ(*root_delegated_shared_quad_state, iter->shared_quad_state);
+ ++iter;
+ EXPECT_EQ(*root_delegated_shared_quad_state, iter->shared_quad_state);
+ ++iter;
+ EXPECT_EQ(*root_delegated_shared_quad_state, iter->shared_quad_state);
+ ++iter;
+ EXPECT_EQ(*root_delegated_shared_quad_state, iter->shared_quad_state);
EXPECT_NE(*contrib_delegated_shared_quad_state,
*root_delegated_shared_quad_state);
@@ -1099,7 +1105,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
- root_delegated_quad_list[0]->shared_quad_state;
+ root_delegated_quad_list.front()->shared_quad_state;
// When the quads don't have a clip of their own, the clip rect is set to
// the drawable_content_rect of the delegated renderer layer.
@@ -1129,7 +1135,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
- root_delegated_quad_list[0]->shared_quad_state;
+ root_delegated_quad_list.front()->shared_quad_state;
// When the quads have a clip of their own, it is used.
EXPECT_EQ(gfx::Rect(25, 25, 40, 40).ToString(),
@@ -1157,7 +1163,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
- root_delegated_quad_list[0]->shared_quad_state;
+ root_delegated_quad_list.front()->shared_quad_state;
// When the quads don't have a clip of their own, the clip rect is set to
// the drawable_content_rect of the delegated renderer layer. When the layer
@@ -1187,7 +1193,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
- root_delegated_quad_list[0]->shared_quad_state;
+ root_delegated_quad_list.front()->shared_quad_state;
// When the quads have a clip of their own, it is used, but it is
// combined with the clip rect of the delegated renderer layer.
@@ -1218,7 +1224,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
- root_delegated_quad_list[0]->shared_quad_state;
+ root_delegated_quad_list.front()->shared_quad_state;
// When the layer owns a surface, the quads don't need to be clipped
// further than they already specify. If they aren't clipped, then their
@@ -1247,7 +1253,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
- root_delegated_quad_list[0]->shared_quad_state;
+ root_delegated_quad_list.front()->shared_quad_state;
// When the quads have a clip of their own, it is used.
EXPECT_EQ(gfx::Rect(5, 5, 40, 40).ToString(),
@@ -1277,7 +1283,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
- root_delegated_quad_list[0]->shared_quad_state;
+ root_delegated_quad_list.front()->shared_quad_state;
// When the layer owns a surface, the quads don't need to be clipped
// further than they already specify. If they aren't clipped, then their
@@ -1305,7 +1311,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) {
const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
- root_delegated_quad_list[0]->shared_quad_state;
+ root_delegated_quad_list.front()->shared_quad_state;
// When the quads have a clip of their own, it is used, but it is
// combined with the clip rect of the delegated renderer layer. If the
@@ -1365,7 +1371,7 @@ TEST_F(DelegatedRendererLayerImplTest, InvalidRenderPassDrawQuad) {
ASSERT_EQ(1u, frame.render_passes.size());
ASSERT_EQ(1u, frame.render_passes[0]->quad_list.size());
EXPECT_EQ(DrawQuad::SOLID_COLOR,
- frame.render_passes[0]->quad_list[0]->material);
+ frame.render_passes[0]->quad_list.front()->material);
host_impl_->DrawLayers(&frame, gfx::FrameTime::Now());
host_impl_->DidDrawAllLayers(frame);
@@ -1422,7 +1428,7 @@ TEST_F(DelegatedRendererLayerImplTest, Occlusion) {
LayerTestCommon::VerifyQuadsExactlyCoverRect(impl.quad_list(),
quad_screen_rect);
ASSERT_EQ(1u, impl.quad_list().size());
- EXPECT_EQ(DrawQuad::RENDER_PASS, impl.quad_list()[0]->material);
+ EXPECT_EQ(DrawQuad::RENDER_PASS, impl.quad_list().front()->material);
}
{
SCOPED_TRACE("Contributing render pass");
@@ -1431,7 +1437,7 @@ TEST_F(DelegatedRendererLayerImplTest, Occlusion) {
LayerTestCommon::VerifyQuadsExactlyCoverRect(
impl.quad_list(), gfx::Rect(quad_screen_rect.size()));
ASSERT_EQ(1u, impl.quad_list().size());
- EXPECT_EQ(DrawQuad::SOLID_COLOR, impl.quad_list()[0]->material);
+ EXPECT_EQ(DrawQuad::SOLID_COLOR, impl.quad_list().front()->material);
}
}
@@ -1496,7 +1502,7 @@ TEST_F(DelegatedRendererLayerImplTest, Occlusion) {
// The occlusion extends to 500 in the x-axis, pushing the left of the
// visible part of the quad to 500 - 211 = 300 - 11 inside the quad.
EXPECT_EQ(gfx::Rect(300 - 11, 0, 100 + 11, 500).ToString(),
- impl.quad_list()[0]->visible_rect.ToString());
+ impl.quad_list().front()->visible_rect.ToString());
}
{
gfx::Rect occlusion_in_root_target(0, 0, 500, 1000);
@@ -1528,7 +1534,7 @@ TEST_F(DelegatedRendererLayerImplTest, Occlusion) {
// root. The occlusion extends to 500 in the x-axis, pushing the left of
// the visible part of the quad to 500 - 222 = 300 - 22 inside the quad.
EXPECT_EQ(gfx::Rect(300 - 22, 0, 100 + 22, 500).ToString(),
- impl.quad_list()[0]->visible_rect.ToString());
+ impl.quad_list().front()->visible_rect.ToString());
}
}
}
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.cc ('k') | cc/layers/nine_patch_layer_impl_unittest.cc » ('j') | cc/output/direct_renderer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698