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

Side by Side Diff: cc/ipc/cc_param_traits_unittest.cc

Issue 2502373003: stop using SkXfermode -- use SkBlendMode instead (Closed)
Patch Set: rebase Created 4 years, 1 month 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
« no previous file with comments | « cc/ipc/cc_param_traits_macros.h ('k') | cc/ipc/shared_quad_state_struct_traits.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 <stddef.h> 5 #include <stddef.h>
6 #include <string.h> 6 #include <string.h>
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 bool arbitrary_bool2 = false; 249 bool arbitrary_bool2 = false;
250 bool arbitrary_bool3 = true; 250 bool arbitrary_bool3 = true;
251 bool arbitrary_bool4 = true; 251 bool arbitrary_bool4 = true;
252 bool arbitrary_bool5 = false; 252 bool arbitrary_bool5 = false;
253 bool arbitrary_bool6 = true; 253 bool arbitrary_bool6 = true;
254 int arbitrary_context_id1 = 12; 254 int arbitrary_context_id1 = 12;
255 int arbitrary_context_id2 = 57; 255 int arbitrary_context_id2 = 57;
256 int arbitrary_context_id3 = -503; 256 int arbitrary_context_id3 = -503;
257 int arbitrary_int = 13; 257 int arbitrary_int = 13;
258 SkColor arbitrary_color = SkColorSetARGB(25, 36, 47, 58); 258 SkColor arbitrary_color = SkColorSetARGB(25, 36, 47, 58);
259 SkXfermode::Mode arbitrary_blend_mode1 = SkXfermode::kScreen_Mode; 259 SkBlendMode arbitrary_blend_mode1 = SkBlendMode::kScreen;
260 SkXfermode::Mode arbitrary_blend_mode2 = SkXfermode::kLighten_Mode; 260 SkBlendMode arbitrary_blend_mode2 = SkBlendMode::kLighten;
261 SkXfermode::Mode arbitrary_blend_mode3 = SkXfermode::kOverlay_Mode; 261 SkBlendMode arbitrary_blend_mode3 = SkBlendMode::kOverlay;
262 ResourceId arbitrary_resourceid1 = 55; 262 ResourceId arbitrary_resourceid1 = 55;
263 ResourceId arbitrary_resourceid2 = 47; 263 ResourceId arbitrary_resourceid2 = 47;
264 ResourceId arbitrary_resourceid3 = 23; 264 ResourceId arbitrary_resourceid3 = 23;
265 ResourceId arbitrary_resourceid4 = 16; 265 ResourceId arbitrary_resourceid4 = 16;
266 SkScalar arbitrary_sigma = SkFloatToScalar(2.0f); 266 SkScalar arbitrary_sigma = SkFloatToScalar(2.0f);
267 YUVVideoDrawQuad::ColorSpace arbitrary_color_space = 267 YUVVideoDrawQuad::ColorSpace arbitrary_color_space =
268 YUVVideoDrawQuad::REC_601; 268 YUVVideoDrawQuad::REC_601;
269 gfx::ColorSpace arbitrary_video_color_space = gfx::ColorSpace::CreateREC601(); 269 gfx::ColorSpace arbitrary_video_color_space = gfx::ColorSpace::CreateREC601();
270 270
271 RenderPassId child_id(30, 5); 271 RenderPassId child_id(30, 5);
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 } 476 }
477 477
478 TEST_F(CCParamTraitsTest, UnusedSharedQuadStates) { 478 TEST_F(CCParamTraitsTest, UnusedSharedQuadStates) {
479 std::unique_ptr<RenderPass> pass_in = RenderPass::Create(); 479 std::unique_ptr<RenderPass> pass_in = RenderPass::Create();
480 pass_in->SetAll(RenderPassId(1, 1), gfx::Rect(100, 100), gfx::Rect(), 480 pass_in->SetAll(RenderPassId(1, 1), gfx::Rect(100, 100), gfx::Rect(),
481 gfx::Transform(), false); 481 gfx::Transform(), false);
482 482
483 // The first SharedQuadState is used. 483 // The first SharedQuadState is used.
484 SharedQuadState* shared_state1_in = pass_in->CreateAndAppendSharedQuadState(); 484 SharedQuadState* shared_state1_in = pass_in->CreateAndAppendSharedQuadState();
485 shared_state1_in->SetAll(gfx::Transform(), gfx::Size(1, 1), gfx::Rect(), 485 shared_state1_in->SetAll(gfx::Transform(), gfx::Size(1, 1), gfx::Rect(),
486 gfx::Rect(), false, 1.f, SkXfermode::kSrcOver_Mode, 486 gfx::Rect(), false, 1.f, SkBlendMode::kSrcOver, 0);
487 0);
488 487
489 SolidColorDrawQuad* quad1 = 488 SolidColorDrawQuad* quad1 =
490 pass_in->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); 489 pass_in->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
491 quad1->SetAll(shared_state1_in, gfx::Rect(10, 10), gfx::Rect(10, 10), 490 quad1->SetAll(shared_state1_in, gfx::Rect(10, 10), gfx::Rect(10, 10),
492 gfx::Rect(10, 10), false, SK_ColorRED, false); 491 gfx::Rect(10, 10), false, SK_ColorRED, false);
493 492
494 // The second and third SharedQuadStates are not used. 493 // The second and third SharedQuadStates are not used.
495 SharedQuadState* shared_state2_in = pass_in->CreateAndAppendSharedQuadState(); 494 SharedQuadState* shared_state2_in = pass_in->CreateAndAppendSharedQuadState();
496 shared_state2_in->SetAll(gfx::Transform(), gfx::Size(2, 2), gfx::Rect(), 495 shared_state2_in->SetAll(gfx::Transform(), gfx::Size(2, 2), gfx::Rect(),
497 gfx::Rect(), false, 1.f, SkXfermode::kSrcOver_Mode, 496 gfx::Rect(), false, 1.f, SkBlendMode::kSrcOver, 0);
498 0);
499 497
500 SharedQuadState* shared_state3_in = pass_in->CreateAndAppendSharedQuadState(); 498 SharedQuadState* shared_state3_in = pass_in->CreateAndAppendSharedQuadState();
501 shared_state3_in->SetAll(gfx::Transform(), gfx::Size(3, 3), gfx::Rect(), 499 shared_state3_in->SetAll(gfx::Transform(), gfx::Size(3, 3), gfx::Rect(),
502 gfx::Rect(), false, 1.f, SkXfermode::kSrcOver_Mode, 500 gfx::Rect(), false, 1.f, SkBlendMode::kSrcOver, 0);
503 0);
504 501
505 // The fourth SharedQuadState is used. 502 // The fourth SharedQuadState is used.
506 SharedQuadState* shared_state4_in = pass_in->CreateAndAppendSharedQuadState(); 503 SharedQuadState* shared_state4_in = pass_in->CreateAndAppendSharedQuadState();
507 shared_state4_in->SetAll(gfx::Transform(), gfx::Size(4, 4), gfx::Rect(), 504 shared_state4_in->SetAll(gfx::Transform(), gfx::Size(4, 4), gfx::Rect(),
508 gfx::Rect(), false, 1.f, SkXfermode::kSrcOver_Mode, 505 gfx::Rect(), false, 1.f, SkBlendMode::kSrcOver, 0);
509 0);
510 506
511 SolidColorDrawQuad* quad2 = 507 SolidColorDrawQuad* quad2 =
512 pass_in->CreateAndAppendDrawQuad<SolidColorDrawQuad>(); 508 pass_in->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
513 quad2->SetAll(shared_state4_in, gfx::Rect(10, 10), gfx::Rect(10, 10), 509 quad2->SetAll(shared_state4_in, gfx::Rect(10, 10), gfx::Rect(10, 10),
514 gfx::Rect(10, 10), false, SK_ColorRED, false); 510 gfx::Rect(10, 10), false, SK_ColorRED, false);
515 511
516 // The fifth is not used again. 512 // The fifth is not used again.
517 SharedQuadState* shared_state5_in = pass_in->CreateAndAppendSharedQuadState(); 513 SharedQuadState* shared_state5_in = pass_in->CreateAndAppendSharedQuadState();
518 shared_state5_in->SetAll(gfx::Transform(), gfx::Size(5, 5), gfx::Rect(), 514 shared_state5_in->SetAll(gfx::Transform(), gfx::Size(5, 5), gfx::Rect(),
519 gfx::Rect(), false, 1.f, SkXfermode::kSrcOver_Mode, 515 gfx::Rect(), false, 1.f, SkBlendMode::kSrcOver, 0);
520 0);
521 516
522 // 5 SharedQuadStates go in. 517 // 5 SharedQuadStates go in.
523 ASSERT_EQ(5u, pass_in->shared_quad_state_list.size()); 518 ASSERT_EQ(5u, pass_in->shared_quad_state_list.size());
524 ASSERT_EQ(2u, pass_in->quad_list.size()); 519 ASSERT_EQ(2u, pass_in->quad_list.size());
525 520
526 CompositorFrame frame_in; 521 CompositorFrame frame_in;
527 frame_in.render_pass_list.push_back(std::move(pass_in)); 522 frame_in.render_pass_list.push_back(std::move(pass_in));
528 523
529 IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL); 524 IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
530 IPC::ParamTraits<CompositorFrame>::Write(&msg, frame_in); 525 IPC::ParamTraits<CompositorFrame>::Write(&msg, frame_in);
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 base::PickleIterator iter(msg); 597 base::PickleIterator iter(msg);
603 EXPECT_TRUE(IPC::ParamTraits<CompositorFrame>::Read(&msg, &iter, &frame_out)); 598 EXPECT_TRUE(IPC::ParamTraits<CompositorFrame>::Read(&msg, &iter, &frame_out));
604 599
605 ASSERT_EQ(2u, frame_out.resource_list.size()); 600 ASSERT_EQ(2u, frame_out.resource_list.size());
606 Compare(arbitrary_resource1, frame_out.resource_list[0]); 601 Compare(arbitrary_resource1, frame_out.resource_list[0]);
607 Compare(arbitrary_resource2, frame_out.resource_list[1]); 602 Compare(arbitrary_resource2, frame_out.resource_list[1]);
608 } 603 }
609 604
610 } // namespace 605 } // namespace
611 } // namespace content 606 } // namespace content
OLDNEW
« no previous file with comments | « cc/ipc/cc_param_traits_macros.h ('k') | cc/ipc/shared_quad_state_struct_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698