Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / quads / draw_quad_unittest.cc

diff --git a/src/cc/quads/draw_quad_unittest.cc b/src/cc/quads/draw_quad_unittest.cc
index e3697ec..d3753ca 100644 (file)
--- a/src/cc/quads/draw_quad_unittest.cc
+++ b/src/cc/quads/draw_quad_unittest.cc
@@ -102,17 +102,20 @@ void CompareDrawQuad(DrawQuad* quad,
       render_pass->CreateAndAppendSharedQuadState();                       \
   copy_shared_state->CopyFrom(shared_state);
 
-#define QUAD_DATA \
-    gfx::Rect quad_rect(30, 40, 50, 60); \
-    gfx::Rect quad_visible_rect(40, 50, 30, 20); \
-    gfx::Rect ALLOW_UNUSED quad_opaque_rect(60, 55, 10, 10); \
-    bool ALLOW_UNUSED needs_blending = true;
+#define QUAD_DATA                              \
+  gfx::Rect quad_rect(30, 40, 50, 60);         \
+  gfx::Rect quad_visible_rect(40, 50, 30, 20); \
+  gfx::Rect quad_opaque_rect(60, 55, 10, 10);  \
+  ALLOW_UNUSED_LOCAL(quad_opaque_rect);        \
+  bool needs_blending = true;                  \
+  ALLOW_UNUSED_LOCAL(needs_blending);
 
 #define SETUP_AND_COPY_QUAD_NEW(Type, quad)                                \
   DrawQuad* copy_new =                                                     \
       render_pass->CopyFromAndAppendDrawQuad(quad_new, copy_shared_state); \
   CompareDrawQuad(quad_new, copy_new, copy_shared_state);                  \
-  const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new);
+  const Type* copy_quad = Type::MaterialCast(copy_new);                    \
+  ALLOW_UNUSED_LOCAL(copy_quad);
 
 #define SETUP_AND_COPY_QUAD_ALL(Type, quad)                                \
   DrawQuad* copy_all =                                                     \
@@ -124,7 +127,8 @@ void CompareDrawQuad(DrawQuad* quad,
   DrawQuad* copy_new = render_pass->CopyFromAndAppendRenderPassDrawQuad( \
       quad_new, copy_shared_state, a);                                   \
   CompareDrawQuad(quad_new, copy_new, copy_shared_state);                \
-  const Type* ALLOW_UNUSED copy_quad = Type::MaterialCast(copy_new);
+  const Type* copy_quad = Type::MaterialCast(copy_new);                  \
+  ALLOW_UNUSED_LOCAL(copy_quad);
 
 #define SETUP_AND_COPY_QUAD_ALL_RP(Type, quad, a)                        \
   DrawQuad* copy_all = render_pass->CopyFromAndAppendRenderPassDrawQuad( \
@@ -328,7 +332,7 @@ void CompareDrawQuad(DrawQuad* quad,
   }                                                        \
   SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
 
-#define CREATE_QUAD_ALL_RP(Type, a, b, c, d, e, f, copy_a)       \
+#define CREATE_QUAD_ALL_RP(Type, a, b, c, d, e, f, g, copy_a)    \
   Type* quad_all = render_pass->CreateAndAppendDrawQuad<Type>(); \
   {                                                              \
     QUAD_DATA quad_all->SetAll(shared_state,                     \
@@ -341,15 +345,17 @@ void CompareDrawQuad(DrawQuad* quad,
                                c,                                \
                                d,                                \
                                e,                                \
-                               f);                               \
+                               f,                                \
+                               g);                               \
   }                                                              \
   SETUP_AND_COPY_QUAD_ALL_RP(Type, quad_all, copy_a);
 
-#define CREATE_QUAD_NEW_RP(Type, a, b, c, d, e, f, g, copy_a)                 \
-  Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>();              \
-  {                                                                           \
-    QUAD_DATA quad_new->SetNew(shared_state, quad_rect, a, b, c, d, e, f, g); \
-  }                                                                           \
+#define CREATE_QUAD_NEW_RP(Type, a, b, c, d, e, f, g, h, copy_a) \
+  Type* quad_new = render_pass->CreateAndAppendDrawQuad<Type>(); \
+  {                                                              \
+    QUAD_DATA quad_new->SetNew(                                  \
+        shared_state, quad_rect, a, b, c, d, e, f, g, h);        \
+  }                                                              \
   SETUP_AND_COPY_QUAD_NEW_RP(Type, quad_new, copy_a);
 
 TEST(DrawQuadTest, CopyCheckerboardDrawQuad) {
@@ -417,7 +423,8 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
   gfx::Rect visible_rect(40, 50, 30, 20);
   RenderPassId render_pass_id(22, 64);
   ResourceProvider::ResourceId mask_resource_id = 78;
-  gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
+  gfx::Vector2dF mask_uv_scale(33.f, 19.f);
+  gfx::Size mask_texture_size(128, 134);
   FilterOperations filters;
   filters.Append(FilterOperation::CreateBlurFilter(1.f));
   gfx::Vector2dF filters_scale;
@@ -432,7 +439,8 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
                      visible_rect,
                      render_pass_id,
                      mask_resource_id,
-                     mask_u_v_rect,
+                     mask_uv_scale,
+                     mask_texture_size,
                      filters,
                      filters_scale,
                      background_filters,
@@ -441,7 +449,9 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
   EXPECT_RECT_EQ(visible_rect, copy_quad->visible_rect);
   EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);
   EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);
-  EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString());
+  EXPECT_EQ(mask_uv_scale.ToString(), copy_quad->mask_uv_scale.ToString());
+  EXPECT_EQ(mask_texture_size.ToString(),
+            copy_quad->mask_texture_size.ToString());
   EXPECT_EQ(filters, copy_quad->filters);
   EXPECT_EQ(filters_scale, copy_quad->filters_scale);
   EXPECT_EQ(background_filters, copy_quad->background_filters);
@@ -449,7 +459,8 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
   CREATE_QUAD_ALL_RP(RenderPassDrawQuad,
                      render_pass_id,
                      mask_resource_id,
-                     mask_u_v_rect,
+                     mask_uv_scale,
+                     mask_texture_size,
                      filters,
                      filters_scale,
                      background_filters,
@@ -457,7 +468,9 @@ TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
   EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
   EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);
   EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);
-  EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString());
+  EXPECT_EQ(mask_uv_scale.ToString(), copy_quad->mask_uv_scale.ToString());
+  EXPECT_EQ(mask_texture_size.ToString(),
+            copy_quad->mask_texture_size.ToString());
   EXPECT_EQ(filters, copy_quad->filters);
   EXPECT_EQ(filters_scale, copy_quad->filters_scale);
   EXPECT_EQ(background_filters, copy_quad->background_filters);
@@ -756,7 +769,8 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
   gfx::Rect visible_rect(40, 50, 30, 20);
   RenderPassId render_pass_id(22, 64);
   ResourceProvider::ResourceId mask_resource_id = 78;
-  gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
+  gfx::Vector2dF mask_uv_scale(33.f, 19.f);
+  gfx::Size mask_texture_size(128, 134);
   FilterOperations filters;
   filters.Append(FilterOperation::CreateBlurFilter(1.f));
   gfx::Vector2dF filters_scale(2.f, 3.f);
@@ -771,7 +785,8 @@ TEST_F(DrawQuadIteratorTest, RenderPassDrawQuad) {
                      visible_rect,
                      render_pass_id,
                      mask_resource_id,
-                     mask_u_v_rect,
+                     mask_uv_scale,
+                     mask_texture_size,
                      filters,
                      filters_scale,
                      background_filters,
@@ -964,14 +979,14 @@ TEST(DrawQuadTest, LargestQuadType) {
         break;
     }
   }
-  EXPECT_EQ(sizeof(kLargestDrawQuad), largest);
+  EXPECT_EQ(LargestDrawQuadSize(), largest);
 
   if (!HasFailure())
     return;
 
   // On failure, output the size of all quads for debugging.
   LOG(ERROR) << "largest " << largest;
-  LOG(ERROR) << "kLargestDrawQuad " << sizeof(kLargestDrawQuad);
+  LOG(ERROR) << "kLargestDrawQuad " << LargestDrawQuadSize();
   for (int i = 0; i <= DrawQuad::MATERIAL_LAST; ++i) {
     switch (static_cast<DrawQuad::Material>(i)) {
       case DrawQuad::CHECKERBOARD: