Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / common / cc_messages_unittest.cc

diff --git a/src/content/common/cc_messages_unittest.cc b/src/content/common/cc_messages_unittest.cc
index 054e079..d92efea 100644 (file)
--- a/src/content/common/cc_messages_unittest.cc
+++ b/src/content/common/cc_messages_unittest.cc
@@ -28,6 +28,7 @@ using cc::FilterOperations;
 using cc::IOSurfaceDrawQuad;
 using cc::PictureDrawQuad;
 using cc::RenderPass;
+using cc::RenderPassId;
 using cc::RenderPassDrawQuad;
 using cc::ResourceProvider;
 using cc::SharedQuadState;
@@ -258,7 +259,7 @@ TEST_F(CCMessagesTest, AllQuads) {
   SkXfermode::Mode arbitrary_blend_mode3 = SkXfermode::kOverlay_Mode;
   IOSurfaceDrawQuad::Orientation arbitrary_orientation =
       IOSurfaceDrawQuad::UNFLIPPED;
-  RenderPass::Id arbitrary_id(10, 14);
+  RenderPassId arbitrary_id(10, 14);
   ResourceProvider::ResourceId arbitrary_resourceid1 = 55;
   ResourceProvider::ResourceId arbitrary_resourceid2 = 47;
   ResourceProvider::ResourceId arbitrary_resourceid3 = 23;
@@ -476,15 +477,19 @@ TEST_F(CCMessagesTest, AllQuads) {
     Compare(pass_cmp->shared_quad_state_list[i],
             pass_in->shared_quad_state_list[i]);
   }
-  for (size_t i = 0; i < pass_in->quad_list.size(); ++i)
-    Compare(pass_cmp->quad_list[i], pass_in->quad_list[i]);
+  for (cc::QuadList::Iterator in_iter = pass_in->quad_list.begin(),
+                              cmp_iter = pass_cmp->quad_list.begin();
+       in_iter != pass_in->quad_list.end();
+       ++in_iter, ++cmp_iter)
+    Compare(&*cmp_iter, &*in_iter);
+
   for (size_t i = 1; i < pass_in->quad_list.size(); ++i) {
     bool same_shared_quad_state_cmp =
-        pass_cmp->quad_list[i]->shared_quad_state ==
-        pass_cmp->quad_list[i - 1]->shared_quad_state;
+        pass_cmp->quad_list.ElementAt(i)->shared_quad_state ==
+        pass_cmp->quad_list.ElementAt(i - 1)->shared_quad_state;
     bool same_shared_quad_state_in =
-        pass_in->quad_list[i]->shared_quad_state ==
-        pass_in->quad_list[i - 1]->shared_quad_state;
+        pass_in->quad_list.ElementAt(i)->shared_quad_state ==
+        pass_in->quad_list.ElementAt(i - 1)->shared_quad_state;
     EXPECT_EQ(same_shared_quad_state_cmp, same_shared_quad_state_in);
   }
 
@@ -508,22 +513,26 @@ TEST_F(CCMessagesTest, AllQuads) {
     Compare(pass_cmp->shared_quad_state_list[i],
             pass_out->shared_quad_state_list[i]);
   }
-  for (size_t i = 0; i < pass_out->quad_list.size(); ++i)
-    Compare(pass_cmp->quad_list[i], pass_out->quad_list[i]);
+  for (cc::QuadList::Iterator out_iter = pass_out->quad_list.begin(),
+                              cmp_iter = pass_cmp->quad_list.begin();
+       out_iter != pass_out->quad_list.end();
+       ++out_iter, ++cmp_iter)
+    Compare(&*cmp_iter, &*out_iter);
+
   for (size_t i = 1; i < pass_out->quad_list.size(); ++i) {
     bool same_shared_quad_state_cmp =
-        pass_cmp->quad_list[i]->shared_quad_state ==
-        pass_cmp->quad_list[i - 1]->shared_quad_state;
+        pass_cmp->quad_list.ElementAt(i)->shared_quad_state ==
+        pass_cmp->quad_list.ElementAt(i - 1)->shared_quad_state;
     bool same_shared_quad_state_out =
-        pass_out->quad_list[i]->shared_quad_state ==
-        pass_out->quad_list[i - 1]->shared_quad_state;
+        pass_out->quad_list.ElementAt(i)->shared_quad_state ==
+        pass_out->quad_list.ElementAt(i - 1)->shared_quad_state;
     EXPECT_EQ(same_shared_quad_state_cmp, same_shared_quad_state_out);
   }
 }
 
 TEST_F(CCMessagesTest, UnusedSharedQuadStates) {
   scoped_ptr<RenderPass> pass_in = RenderPass::Create();
-  pass_in->SetAll(RenderPass::Id(1, 1),
+  pass_in->SetAll(RenderPassId(1, 1),
                   gfx::Rect(100, 100),
                   gfx::Rect(),
                   gfx::Transform(),
@@ -668,7 +677,7 @@ TEST_F(CCMessagesTest, Resources) {
 
   scoped_ptr<RenderPass> renderpass_in = RenderPass::Create();
   renderpass_in->SetNew(
-      RenderPass::Id(1, 1), gfx::Rect(), gfx::Rect(), gfx::Transform());
+      RenderPassId(1, 1), gfx::Rect(), gfx::Rect(), gfx::Transform());
 
   DelegatedFrameData frame_in;
   frame_in.resource_list.push_back(arbitrary_resource1);