Update To 11.40.268.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 d92efea..cc1fdf0 100644 (file)
--- a/src/content/common/cc_messages_unittest.cc
+++ b/src/content/common/cc_messages_unittest.cc
@@ -145,7 +145,8 @@ class CCMessagesTest : public testing::Test {
   void Compare(const RenderPassDrawQuad* a, const RenderPassDrawQuad* b) {
     EXPECT_EQ(a->render_pass_id, b->render_pass_id);
     EXPECT_EQ(a->mask_resource_id, b->mask_resource_id);
-    EXPECT_EQ(a->mask_uv_rect.ToString(), b->mask_uv_rect.ToString());
+    EXPECT_EQ(a->mask_uv_scale.ToString(), b->mask_uv_scale.ToString());
+    EXPECT_EQ(a->mask_texture_size.ToString(), b->mask_texture_size.ToString());
     EXPECT_EQ(a->filters.size(), b->filters.size());
     for (size_t i = 0; i < a->filters.size(); ++i) {
       if (a->filters.at(i).type() != cc::FilterOperation::REFERENCE) {
@@ -242,6 +243,7 @@ TEST_F(CCMessagesTest, AllQuads) {
   gfx::PointF arbitrary_pointf1(31.4f, 15.9f);
   gfx::PointF arbitrary_pointf2(26.5f, -35.8f);
   gfx::Vector2dF arbitrary_vector2df1(16.2f, -85.1f);
+  gfx::Vector2dF arbitrary_vector2df2(-8.3f, 0.47f);
   float arbitrary_float1 = 0.7f;
   float arbitrary_float2 = 0.3f;
   float arbitrary_float3 = 0.9f;
@@ -366,9 +368,10 @@ TEST_F(CCMessagesTest, AllQuads) {
                         arbitrary_bool1,
                         arbitrary_id,
                         arbitrary_resourceid2,
-                        arbitrary_rectf1,
-                        arbitrary_filters1,
                         arbitrary_vector2df1,
+                        arbitrary_size1,
+                        arbitrary_filters1,
+                        arbitrary_vector2df2,
                         arbitrary_filters2);
   pass_cmp->CopyFromAndAppendRenderPassDrawQuad(
       renderpass_in,
@@ -473,15 +476,18 @@ TEST_F(CCMessagesTest, AllQuads) {
   Compare(pass_cmp.get(), pass_in.get());
   ASSERT_EQ(3u, pass_in->shared_quad_state_list.size());
   ASSERT_EQ(10u, pass_in->quad_list.size());
-  for (size_t i = 0; i < 3; ++i) {
-    Compare(pass_cmp->shared_quad_state_list[i],
-            pass_in->shared_quad_state_list[i]);
+  for (cc::SharedQuadStateList::ConstIterator
+           cmp_iterator = pass_cmp->shared_quad_state_list.begin(),
+           in_iterator = pass_in->shared_quad_state_list.begin();
+       in_iterator != pass_in->shared_quad_state_list.end();
+       ++cmp_iterator, ++in_iterator) {
+    Compare(*cmp_iterator, *in_iterator);
   }
-  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();
+  for (auto in_iter = pass_in->quad_list.cbegin(),
+            cmp_iter = pass_cmp->quad_list.cbegin();
+       in_iter != pass_in->quad_list.cend();
        ++in_iter, ++cmp_iter)
-    Compare(&*cmp_iter, &*in_iter);
+    Compare(*cmp_iter, *in_iter);
 
   for (size_t i = 1; i < pass_in->quad_list.size(); ++i) {
     bool same_shared_quad_state_cmp =
@@ -509,15 +515,18 @@ TEST_F(CCMessagesTest, AllQuads) {
   Compare(pass_cmp.get(), pass_out.get());
   ASSERT_EQ(3u, pass_out->shared_quad_state_list.size());
   ASSERT_EQ(10u, pass_out->quad_list.size());
-  for (size_t i = 0; i < 3; ++i) {
-    Compare(pass_cmp->shared_quad_state_list[i],
-            pass_out->shared_quad_state_list[i]);
+  for (cc::SharedQuadStateList::ConstIterator
+           cmp_iterator = pass_cmp->shared_quad_state_list.begin(),
+           out_iterator = pass_out->shared_quad_state_list.begin();
+       out_iterator != pass_out->shared_quad_state_list.end();
+       ++cmp_iterator, ++out_iterator) {
+    Compare(*cmp_iterator, *out_iterator);
   }
-  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();
+  for (auto out_iter = pass_out->quad_list.cbegin(),
+            cmp_iter = pass_cmp->quad_list.cbegin();
+       out_iter != pass_out->quad_list.cend();
        ++out_iter, ++cmp_iter)
-    Compare(&*cmp_iter, &*out_iter);
+    Compare(*cmp_iter, *out_iter);
 
   for (size_t i = 1; i < pass_out->quad_list.size(); ++i) {
     bool same_shared_quad_state_cmp =
@@ -633,10 +642,12 @@ TEST_F(CCMessagesTest, UnusedSharedQuadStates) {
   ASSERT_EQ(2u, pass_out->shared_quad_state_list.size());
   ASSERT_EQ(2u, pass_out->quad_list.size());
 
-  EXPECT_EQ(gfx::Size(1, 1).ToString(),
-            pass_out->shared_quad_state_list[0]->content_bounds.ToString());
-  EXPECT_EQ(gfx::Size(4, 4).ToString(),
-            pass_out->shared_quad_state_list[1]->content_bounds.ToString());
+  EXPECT_EQ(
+      gfx::Size(1, 1).ToString(),
+      pass_out->shared_quad_state_list.ElementAt(0)->content_bounds.ToString());
+  EXPECT_EQ(
+      gfx::Size(4, 4).ToString(),
+      pass_out->shared_quad_state_list.ElementAt(1)->content_bounds.ToString());
 }
 
 TEST_F(CCMessagesTest, Resources) {