Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / cc / surfaces / surface_aggregator_test_helpers.cc

diff --git a/src/cc/surfaces/surface_aggregator_test_helpers.cc b/src/cc/surfaces/surface_aggregator_test_helpers.cc
index f5b623b..8ecf89e 100644 (file)
--- a/src/cc/surfaces/surface_aggregator_test_helpers.cc
+++ b/src/cc/surfaces/surface_aggregator_test_helpers.cc
@@ -51,8 +51,7 @@ void AddTestSurfaceQuad(TestRenderPass* pass,
                        gfx::Rect(surface_size),
                        surface_id);
 }
-void AddTestRenderPassQuad(TestRenderPass* pass,
-                           RenderPass::Id render_pass_id) {
+void AddTestRenderPassQuad(TestRenderPass* pass, RenderPassId render_pass_id) {
   gfx::Rect output_rect = gfx::Rect(0, 0, 5, 5);
   SharedQuadState* shared_state = pass->CreateAndAppendSharedQuadState();
   shared_state->SetAll(gfx::Transform(),
@@ -107,7 +106,7 @@ void AddPasses(RenderPassList* pass_list,
   }
 }
 
-void TestQuadMatchesExpectations(Quad expected_quad, DrawQuad* quad) {
+void TestQuadMatchesExpectations(Quad expected_quad, const DrawQuad* quad) {
   switch (expected_quad.material) {
     case DrawQuad::SOLID_COLOR: {
       ASSERT_EQ(DrawQuad::SOLID_COLOR, quad->material);
@@ -118,23 +117,36 @@ void TestQuadMatchesExpectations(Quad expected_quad, DrawQuad* quad) {
       EXPECT_EQ(expected_quad.color, solid_color_quad->color);
       break;
     }
+    case DrawQuad::RENDER_PASS: {
+      ASSERT_EQ(DrawQuad::RENDER_PASS, quad->material);
+
+      const RenderPassDrawQuad* render_pass_quad =
+          RenderPassDrawQuad::MaterialCast(quad);
+
+      EXPECT_EQ(expected_quad.render_pass_id, render_pass_quad->render_pass_id);
+      break;
+    }
     default:
       NOTREACHED();
       break;
   }
 }
 
-void TestPassMatchesExpectations(Pass expected_pass, RenderPass* pass) {
+void TestPassMatchesExpectations(Pass expected_pass, const RenderPass* pass) {
   ASSERT_EQ(expected_pass.quad_count, pass->quad_list.size());
-  for (size_t i = 0u; i < pass->quad_list.size(); ++i) {
+  size_t i = 0;
+  for (QuadList::ConstIterator iter = pass->quad_list.begin();
+       iter != pass->quad_list.end();
+       ++iter) {
     SCOPED_TRACE(base::StringPrintf("Quad number %" PRIuS, i));
-    TestQuadMatchesExpectations(expected_pass.quads[i], pass->quad_list.at(i));
+    TestQuadMatchesExpectations(expected_pass.quads[i], &*iter);
+    ++i;
   }
 }
 
 void TestPassesMatchExpectations(Pass* expected_passes,
                                  size_t expected_pass_count,
-                                 RenderPassList* passes) {
+                                 const RenderPassList* passes) {
   ASSERT_EQ(expected_pass_count, passes->size());
 
   for (size_t i = 0; i < passes->size(); ++i) {