| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/quads/draw_quad.h" | 5 #include "cc/quads/draw_quad.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 | 311 |
| 312 #define CREATE_QUAD_9_NEW(Type, a, b, c, d, e, f, g, h, i) \ | 312 #define CREATE_QUAD_9_NEW(Type, a, b, c, d, e, f, g, h, i) \ |
| 313 scoped_ptr<Type> quad_new(Type::Create()); \ | 313 scoped_ptr<Type> quad_new(Type::Create()); \ |
| 314 { \ | 314 { \ |
| 315 QUAD_DATA \ | 315 QUAD_DATA \ |
| 316 quad_new->SetNew(shared_state.get(), quad_rect, \ | 316 quad_new->SetNew(shared_state.get(), quad_rect, \ |
| 317 a, b, c, d, e, f, g, h, i); \ | 317 a, b, c, d, e, f, g, h, i); \ |
| 318 } \ | 318 } \ |
| 319 SETUP_AND_COPY_QUAD_NEW(Type, quad_new); | 319 SETUP_AND_COPY_QUAD_NEW(Type, quad_new); |
| 320 | 320 |
| 321 #define CREATE_QUAD_9_NEW_1(Type, a, b, c, d, e, f, g, h, i, copy_a) \ |
| 322 scoped_ptr<Type> quad_new(Type::Create()); \ |
| 323 { \ |
| 324 QUAD_DATA \ |
| 325 quad_new->SetNew(shared_state.get(), quad_rect, a, b, c, d, e, f, g, h, \ |
| 326 i); \ |
| 327 } \ |
| 328 SETUP_AND_COPY_QUAD_NEW_1(Type, quad_new, copy_a); |
| 329 |
| 321 #define CREATE_QUAD_9_ALL(Type, a, b, c, d, e, f, g, h, i) \ | 330 #define CREATE_QUAD_9_ALL(Type, a, b, c, d, e, f, g, h, i) \ |
| 322 scoped_ptr<Type> quad_all(Type::Create()); \ | 331 scoped_ptr<Type> quad_all(Type::Create()); \ |
| 323 { \ | 332 { \ |
| 324 QUAD_DATA \ | 333 QUAD_DATA \ |
| 325 quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \ | 334 quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \ |
| 326 quad_visible_rect, needs_blending, \ | 335 quad_visible_rect, needs_blending, \ |
| 327 a, b, c, d, e, f, g, h, i); \ | 336 a, b, c, d, e, f, g, h, i); \ |
| 328 } \ | 337 } \ |
| 329 SETUP_AND_COPY_QUAD_ALL(Type, quad_all); | 338 SETUP_AND_COPY_QUAD_ALL(Type, quad_all); |
| 330 | 339 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 391 | 400 |
| 392 TEST(DrawQuadTest, CopyRenderPassDrawQuad) { | 401 TEST(DrawQuadTest, CopyRenderPassDrawQuad) { |
| 393 gfx::Rect visible_rect(40, 50, 30, 20); | 402 gfx::Rect visible_rect(40, 50, 30, 20); |
| 394 RenderPass::Id render_pass_id(22, 64); | 403 RenderPass::Id render_pass_id(22, 64); |
| 395 bool is_replica = true; | 404 bool is_replica = true; |
| 396 ResourceProvider::ResourceId mask_resource_id = 78; | 405 ResourceProvider::ResourceId mask_resource_id = 78; |
| 397 gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24); | 406 gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24); |
| 398 gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f); | 407 gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f); |
| 399 FilterOperations filters; | 408 FilterOperations filters; |
| 400 filters.Append(FilterOperation::CreateBlurFilter(1.f)); | 409 filters.Append(FilterOperation::CreateBlurFilter(1.f)); |
| 410 gfx::Vector2dF filters_scale; |
| 401 FilterOperations background_filters; | 411 FilterOperations background_filters; |
| 402 background_filters.Append( | 412 background_filters.Append( |
| 403 FilterOperation::CreateGrayscaleFilter(1.f)); | 413 FilterOperation::CreateGrayscaleFilter(1.f)); |
| 404 | 414 |
| 405 RenderPass::Id copied_render_pass_id(235, 11); | 415 RenderPass::Id copied_render_pass_id(235, 11); |
| 406 CREATE_SHARED_STATE(); | 416 CREATE_SHARED_STATE(); |
| 407 | 417 |
| 408 CREATE_QUAD_8_NEW_1(RenderPassDrawQuad, | 418 CREATE_QUAD_9_NEW_1(RenderPassDrawQuad, |
| 409 visible_rect, | 419 visible_rect, |
| 410 render_pass_id, | 420 render_pass_id, |
| 411 is_replica, | 421 is_replica, |
| 412 mask_resource_id, | 422 mask_resource_id, |
| 413 contents_changed_since_last_frame, | 423 contents_changed_since_last_frame, |
| 414 mask_u_v_rect, | 424 mask_u_v_rect, |
| 415 filters, | 425 filters, |
| 426 filters_scale, |
| 416 background_filters, | 427 background_filters, |
| 417 copied_render_pass_id); | 428 copied_render_pass_id); |
| 418 EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material); | 429 EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material); |
| 419 EXPECT_RECT_EQ(visible_rect, copy_quad->visible_rect); | 430 EXPECT_RECT_EQ(visible_rect, copy_quad->visible_rect); |
| 420 EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id); | 431 EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id); |
| 421 EXPECT_EQ(is_replica, copy_quad->is_replica); | 432 EXPECT_EQ(is_replica, copy_quad->is_replica); |
| 422 EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id); | 433 EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id); |
| 423 EXPECT_RECT_EQ(contents_changed_since_last_frame, | 434 EXPECT_RECT_EQ(contents_changed_since_last_frame, |
| 424 copy_quad->contents_changed_since_last_frame); | 435 copy_quad->contents_changed_since_last_frame); |
| 425 EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString()); | 436 EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString()); |
| 426 EXPECT_EQ(filters, copy_quad->filters); | 437 EXPECT_EQ(filters, copy_quad->filters); |
| 427 EXPECT_EQ(background_filters, copy_quad->background_filters); | 438 EXPECT_EQ(background_filters, copy_quad->background_filters); |
| 428 | 439 |
| 429 CREATE_QUAD_7_ALL_1(RenderPassDrawQuad, | 440 CREATE_QUAD_8_ALL_1(RenderPassDrawQuad, |
| 430 render_pass_id, | 441 render_pass_id, |
| 431 is_replica, | 442 is_replica, |
| 432 mask_resource_id, | 443 mask_resource_id, |
| 433 contents_changed_since_last_frame, | 444 contents_changed_since_last_frame, |
| 434 mask_u_v_rect, | 445 mask_u_v_rect, |
| 435 filters, | 446 filters, |
| 447 filters_scale, |
| 436 background_filters, | 448 background_filters, |
| 437 copied_render_pass_id); | 449 copied_render_pass_id); |
| 438 EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material); | 450 EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material); |
| 439 EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id); | 451 EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id); |
| 440 EXPECT_EQ(is_replica, copy_quad->is_replica); | 452 EXPECT_EQ(is_replica, copy_quad->is_replica); |
| 441 EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id); | 453 EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id); |
| 442 EXPECT_RECT_EQ(contents_changed_since_last_frame, | 454 EXPECT_RECT_EQ(contents_changed_since_last_frame, |
| 443 copy_quad->contents_changed_since_last_frame); | 455 copy_quad->contents_changed_since_last_frame); |
| 444 EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString()); | 456 EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString()); |
| 445 EXPECT_EQ(filters, copy_quad->filters); | 457 EXPECT_EQ(filters, copy_quad->filters); |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f); | 751 gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f); |
| 740 FilterOperations filters; | 752 FilterOperations filters; |
| 741 filters.Append(FilterOperation::CreateBlurFilter(1.f)); | 753 filters.Append(FilterOperation::CreateBlurFilter(1.f)); |
| 742 FilterOperations background_filters; | 754 FilterOperations background_filters; |
| 743 background_filters.Append( | 755 background_filters.Append( |
| 744 FilterOperation::CreateGrayscaleFilter(1.f)); | 756 FilterOperation::CreateGrayscaleFilter(1.f)); |
| 745 | 757 |
| 746 RenderPass::Id copied_render_pass_id(235, 11); | 758 RenderPass::Id copied_render_pass_id(235, 11); |
| 747 | 759 |
| 748 CREATE_SHARED_STATE(); | 760 CREATE_SHARED_STATE(); |
| 749 CREATE_QUAD_8_NEW_1(RenderPassDrawQuad, | 761 CREATE_QUAD_9_NEW_1(RenderPassDrawQuad, |
| 750 visible_rect, | 762 visible_rect, |
| 751 render_pass_id, | 763 render_pass_id, |
| 752 is_replica, | 764 is_replica, |
| 753 mask_resource_id, | 765 mask_resource_id, |
| 754 contents_changed_since_last_frame, | 766 contents_changed_since_last_frame, |
| 755 mask_u_v_rect, | 767 mask_u_v_rect, |
| 756 filters, | 768 filters, |
| 769 gfx::Vector2dF(), |
| 757 background_filters, | 770 background_filters, |
| 758 copied_render_pass_id); | 771 copied_render_pass_id); |
| 759 EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id); | 772 EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id); |
| 760 EXPECT_EQ(1, IterateAndCount(quad_new.get())); | 773 EXPECT_EQ(1, IterateAndCount(quad_new.get())); |
| 761 EXPECT_EQ(mask_resource_id + 1, quad_new->mask_resource_id); | 774 EXPECT_EQ(mask_resource_id + 1, quad_new->mask_resource_id); |
| 762 quad_new->mask_resource_id = 0; | 775 quad_new->mask_resource_id = 0; |
| 763 EXPECT_EQ(0, IterateAndCount(quad_new.get())); | 776 EXPECT_EQ(0, IterateAndCount(quad_new.get())); |
| 764 EXPECT_EQ(0u, quad_new->mask_resource_id); | 777 EXPECT_EQ(0u, quad_new->mask_resource_id); |
| 765 } | 778 } |
| 766 | 779 |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 894 texture_size, | 907 texture_size, |
| 895 texture_format, | 908 texture_format, |
| 896 content_rect, | 909 content_rect, |
| 897 contents_scale, | 910 contents_scale, |
| 898 picture_pile); | 911 picture_pile); |
| 899 EXPECT_EQ(0, IterateAndCount(quad_new.get())); | 912 EXPECT_EQ(0, IterateAndCount(quad_new.get())); |
| 900 } | 913 } |
| 901 | 914 |
| 902 } // namespace | 915 } // namespace |
| 903 } // namespace cc | 916 } // namespace cc |
| OLD | NEW |