Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(128)

Side by Side Diff: cc/quads/draw_quad_unittest.cc

Issue 191123002: Implement hidpi and pinch-zoom scaling of filter params in cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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, i) ; \
326 } \
327 SETUP_AND_COPY_QUAD_NEW_1(Type, quad_new, copy_a);
328
321 #define CREATE_QUAD_9_ALL(Type, a, b, c, d, e, f, g, h, i) \ 329 #define CREATE_QUAD_9_ALL(Type, a, b, c, d, e, f, g, h, i) \
322 scoped_ptr<Type> quad_all(Type::Create()); \ 330 scoped_ptr<Type> quad_all(Type::Create()); \
323 { \ 331 { \
324 QUAD_DATA \ 332 QUAD_DATA \
325 quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \ 333 quad_all->SetAll(shared_state.get(), quad_rect, quad_opaque_rect, \
326 quad_visible_rect, needs_blending, \ 334 quad_visible_rect, needs_blending, \
327 a, b, c, d, e, f, g, h, i); \ 335 a, b, c, d, e, f, g, h, i); \
328 } \ 336 } \
329 SETUP_AND_COPY_QUAD_ALL(Type, quad_all); 337 SETUP_AND_COPY_QUAD_ALL(Type, quad_all);
330 338
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 399
392 TEST(DrawQuadTest, CopyRenderPassDrawQuad) { 400 TEST(DrawQuadTest, CopyRenderPassDrawQuad) {
393 gfx::Rect visible_rect(40, 50, 30, 20); 401 gfx::Rect visible_rect(40, 50, 30, 20);
394 RenderPass::Id render_pass_id(22, 64); 402 RenderPass::Id render_pass_id(22, 64);
395 bool is_replica = true; 403 bool is_replica = true;
396 ResourceProvider::ResourceId mask_resource_id = 78; 404 ResourceProvider::ResourceId mask_resource_id = 78;
397 gfx::Rect contents_changed_since_last_frame(42, 11, 74, 24); 405 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); 406 gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
399 FilterOperations filters; 407 FilterOperations filters;
400 filters.Append(FilterOperation::CreateBlurFilter(1.f)); 408 filters.Append(FilterOperation::CreateBlurFilter(1.f));
409 gfx::Vector2dF filters_scale;
401 FilterOperations background_filters; 410 FilterOperations background_filters;
402 background_filters.Append( 411 background_filters.Append(
403 FilterOperation::CreateGrayscaleFilter(1.f)); 412 FilterOperation::CreateGrayscaleFilter(1.f));
404 413
405 RenderPass::Id copied_render_pass_id(235, 11); 414 RenderPass::Id copied_render_pass_id(235, 11);
406 CREATE_SHARED_STATE(); 415 CREATE_SHARED_STATE();
407 416
408 CREATE_QUAD_8_NEW_1(RenderPassDrawQuad, 417 CREATE_QUAD_9_NEW_1(RenderPassDrawQuad,
409 visible_rect, 418 visible_rect,
410 render_pass_id, 419 render_pass_id,
411 is_replica, 420 is_replica,
412 mask_resource_id, 421 mask_resource_id,
413 contents_changed_since_last_frame, 422 contents_changed_since_last_frame,
414 mask_u_v_rect, 423 mask_u_v_rect,
415 filters, 424 filters,
425 filters_scale,
416 background_filters, 426 background_filters,
417 copied_render_pass_id); 427 copied_render_pass_id);
418 EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material); 428 EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
419 EXPECT_RECT_EQ(visible_rect, copy_quad->visible_rect); 429 EXPECT_RECT_EQ(visible_rect, copy_quad->visible_rect);
420 EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id); 430 EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);
421 EXPECT_EQ(is_replica, copy_quad->is_replica); 431 EXPECT_EQ(is_replica, copy_quad->is_replica);
422 EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id); 432 EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);
423 EXPECT_RECT_EQ(contents_changed_since_last_frame, 433 EXPECT_RECT_EQ(contents_changed_since_last_frame,
424 copy_quad->contents_changed_since_last_frame); 434 copy_quad->contents_changed_since_last_frame);
425 EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString()); 435 EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString());
426 EXPECT_EQ(filters, copy_quad->filters); 436 EXPECT_EQ(filters, copy_quad->filters);
427 EXPECT_EQ(background_filters, copy_quad->background_filters); 437 EXPECT_EQ(background_filters, copy_quad->background_filters);
428 438
429 CREATE_QUAD_7_ALL_1(RenderPassDrawQuad, 439 CREATE_QUAD_8_ALL_1(RenderPassDrawQuad,
430 render_pass_id, 440 render_pass_id,
431 is_replica, 441 is_replica,
432 mask_resource_id, 442 mask_resource_id,
433 contents_changed_since_last_frame, 443 contents_changed_since_last_frame,
434 mask_u_v_rect, 444 mask_u_v_rect,
435 filters, 445 filters,
446 filters_scale,
436 background_filters, 447 background_filters,
437 copied_render_pass_id); 448 copied_render_pass_id);
438 EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material); 449 EXPECT_EQ(DrawQuad::RENDER_PASS, copy_quad->material);
439 EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id); 450 EXPECT_EQ(copied_render_pass_id, copy_quad->render_pass_id);
440 EXPECT_EQ(is_replica, copy_quad->is_replica); 451 EXPECT_EQ(is_replica, copy_quad->is_replica);
441 EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id); 452 EXPECT_EQ(mask_resource_id, copy_quad->mask_resource_id);
442 EXPECT_RECT_EQ(contents_changed_since_last_frame, 453 EXPECT_RECT_EQ(contents_changed_since_last_frame,
443 copy_quad->contents_changed_since_last_frame); 454 copy_quad->contents_changed_since_last_frame);
444 EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString()); 455 EXPECT_EQ(mask_u_v_rect.ToString(), copy_quad->mask_uv_rect.ToString());
445 EXPECT_EQ(filters, copy_quad->filters); 456 EXPECT_EQ(filters, copy_quad->filters);
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f); 750 gfx::RectF mask_u_v_rect(-45.f, -21.f, 33.f, 19.f);
740 FilterOperations filters; 751 FilterOperations filters;
741 filters.Append(FilterOperation::CreateBlurFilter(1.f)); 752 filters.Append(FilterOperation::CreateBlurFilter(1.f));
742 FilterOperations background_filters; 753 FilterOperations background_filters;
743 background_filters.Append( 754 background_filters.Append(
744 FilterOperation::CreateGrayscaleFilter(1.f)); 755 FilterOperation::CreateGrayscaleFilter(1.f));
745 756
746 RenderPass::Id copied_render_pass_id(235, 11); 757 RenderPass::Id copied_render_pass_id(235, 11);
747 758
748 CREATE_SHARED_STATE(); 759 CREATE_SHARED_STATE();
749 CREATE_QUAD_8_NEW_1(RenderPassDrawQuad, 760 CREATE_QUAD_9_NEW_1(RenderPassDrawQuad,
750 visible_rect, 761 visible_rect,
751 render_pass_id, 762 render_pass_id,
752 is_replica, 763 is_replica,
753 mask_resource_id, 764 mask_resource_id,
754 contents_changed_since_last_frame, 765 contents_changed_since_last_frame,
755 mask_u_v_rect, 766 mask_u_v_rect,
756 filters, 767 filters,
768 gfx::Vector2dF(),
757 background_filters, 769 background_filters,
758 copied_render_pass_id); 770 copied_render_pass_id);
759 EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id); 771 EXPECT_EQ(mask_resource_id, quad_new->mask_resource_id);
760 EXPECT_EQ(1, IterateAndCount(quad_new.get())); 772 EXPECT_EQ(1, IterateAndCount(quad_new.get()));
761 EXPECT_EQ(mask_resource_id + 1, quad_new->mask_resource_id); 773 EXPECT_EQ(mask_resource_id + 1, quad_new->mask_resource_id);
762 quad_new->mask_resource_id = 0; 774 quad_new->mask_resource_id = 0;
763 EXPECT_EQ(0, IterateAndCount(quad_new.get())); 775 EXPECT_EQ(0, IterateAndCount(quad_new.get()));
764 EXPECT_EQ(0u, quad_new->mask_resource_id); 776 EXPECT_EQ(0u, quad_new->mask_resource_id);
765 } 777 }
766 778
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
894 texture_size, 906 texture_size,
895 texture_format, 907 texture_format,
896 content_rect, 908 content_rect,
897 contents_scale, 909 contents_scale,
898 picture_pile); 910 picture_pile);
899 EXPECT_EQ(0, IterateAndCount(quad_new.get())); 911 EXPECT_EQ(0, IterateAndCount(quad_new.get()));
900 } 912 }
901 913
902 } // namespace 914 } // namespace
903 } // namespace cc 915 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698