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

Unified Diff: mojo/services/public/cpp/surfaces/tests/surface_unittest.cc

Issue 448303002: Use custom ListContainer to allocate DrawQuads (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@perftest
Patch Set: change header files to try fix 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 | « mojo/services/public/cpp/surfaces/lib/surfaces_type_converters.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/public/cpp/surfaces/tests/surface_unittest.cc
diff --git a/mojo/services/public/cpp/surfaces/tests/surface_unittest.cc b/mojo/services/public/cpp/surfaces/tests/surface_unittest.cc
index cc7c2e898941dde9d7e3c50794ac09653490fe31..93cf57148e48fa421637c9e661c623a8e3c063bc 100644
--- a/mojo/services/public/cpp/surfaces/tests/surface_unittest.cc
+++ b/mojo/services/public/cpp/surfaces/tests/surface_unittest.cc
@@ -69,7 +69,7 @@ TEST_F(SurfaceLibQuadTest, ColorQuad) {
arbitrary_color,
force_anti_aliasing_off);
- QuadPtr mojo_quad = Quad::From(*(pass->quad_list.back()));
+ QuadPtr mojo_quad = Quad::From<cc::DrawQuad>(*color_quad);
ASSERT_FALSE(mojo_quad.is_null());
EXPECT_EQ(MATERIAL_SOLID_COLOR, mojo_quad->material);
EXPECT_EQ(Rect::From(rect), mojo_quad->rect);
@@ -89,7 +89,7 @@ TEST_F(SurfaceLibQuadTest, SurfaceQuad) {
surface_quad->SetAll(
sqs, rect, opaque_rect, visible_rect, needs_blending, arbitrary_id);
- QuadPtr mojo_quad = Quad::From(*(pass->quad_list.back()));
+ QuadPtr mojo_quad = Quad::From<cc::DrawQuad>(*surface_quad);
ASSERT_FALSE(mojo_quad.is_null());
EXPECT_EQ(MATERIAL_SURFACE_CONTENT, mojo_quad->material);
ASSERT_TRUE(mojo_quad->surface_quad_state);
@@ -121,7 +121,7 @@ TEST_F(SurfaceLibQuadTest, TextureQuad) {
vertex_opacity,
flipped);
- QuadPtr mojo_quad = Quad::From(*(pass->quad_list.back()));
+ QuadPtr mojo_quad = Quad::From<cc::DrawQuad>(*texture_quad);
ASSERT_FALSE(mojo_quad.is_null());
EXPECT_EQ(MATERIAL_TEXTURE_CONTENT, mojo_quad->material);
ASSERT_TRUE(mojo_quad->texture_quad_state);
@@ -317,31 +317,31 @@ TEST(SurfaceLibTest, RenderPass) {
EXPECT_EQ(opacity, round_trip_sqs->opacity);
EXPECT_EQ(sorting_context_id, round_trip_sqs->sorting_context_id);
- cc::QuadList::iterator dq_iter = round_trip_pass->quad_list.begin();
+ cc::QuadList::Iterator dq_iter = round_trip_pass->quad_list.begin();
// First is solid color quad.
- ASSERT_EQ(cc::DrawQuad::SOLID_COLOR, (*dq_iter)->material);
- EXPECT_EQ(rect, (*dq_iter)->rect);
- EXPECT_EQ(opaque_rect, (*dq_iter)->opaque_rect);
- EXPECT_EQ(visible_rect, (*dq_iter)->visible_rect);
- EXPECT_EQ(needs_blending, (*dq_iter)->needs_blending);
+ ASSERT_EQ(cc::DrawQuad::SOLID_COLOR, dq_iter->material);
+ EXPECT_EQ(rect, dq_iter->rect);
+ EXPECT_EQ(opaque_rect, dq_iter->opaque_rect);
+ EXPECT_EQ(visible_rect, dq_iter->visible_rect);
+ EXPECT_EQ(needs_blending, dq_iter->needs_blending);
const cc::SolidColorDrawQuad* round_trip_color_quad =
- cc::SolidColorDrawQuad::MaterialCast(*dq_iter);
+ cc::SolidColorDrawQuad::MaterialCast(&*dq_iter);
EXPECT_EQ(arbitrary_color, round_trip_color_quad->color);
EXPECT_EQ(force_anti_aliasing_off,
round_trip_color_quad->force_anti_aliasing_off);
++dq_iter;
// Second is surface quad.
- ASSERT_EQ(cc::DrawQuad::SURFACE_CONTENT, (*dq_iter)->material);
+ ASSERT_EQ(cc::DrawQuad::SURFACE_CONTENT, dq_iter->material);
const cc::SurfaceDrawQuad* round_trip_surface_quad =
- cc::SurfaceDrawQuad::MaterialCast(*dq_iter);
+ cc::SurfaceDrawQuad::MaterialCast(&*dq_iter);
EXPECT_EQ(arbitrary_id, round_trip_surface_quad->surface_id);
++dq_iter;
// Third is texture quad.
- ASSERT_EQ(cc::DrawQuad::TEXTURE_CONTENT, (*dq_iter)->material);
+ ASSERT_EQ(cc::DrawQuad::TEXTURE_CONTENT, dq_iter->material);
const cc::TextureDrawQuad* round_trip_texture_quad =
- cc::TextureDrawQuad::MaterialCast(*dq_iter);
+ cc::TextureDrawQuad::MaterialCast(&*dq_iter);
EXPECT_EQ(resource_id, round_trip_texture_quad->resource_id);
EXPECT_EQ(premultiplied_alpha, round_trip_texture_quad->premultiplied_alpha);
EXPECT_EQ(uv_top_left, round_trip_texture_quad->uv_top_left);
« no previous file with comments | « mojo/services/public/cpp/surfaces/lib/surfaces_type_converters.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698