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

Unified Diff: content/common/cc_messages_unittest.cc

Issue 23455060: mix-blend-mode implementation for accelerated layers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed src/webkit/renderer/compositor_bindings Created 7 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 side-by-side diff with in-line comments
Download patch
« cc/trees/occlusion_tracker.cc ('K') | « content/common/cc_messages.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cc_messages_unittest.cc
diff --git a/content/common/cc_messages_unittest.cc b/content/common/cc_messages_unittest.cc
index 853175bfaa70d458d4539688f7ebc4f4ff540b9e..e2159ee8e1ef1bac781df4e4ce7e5bef6deaa55a 100644
--- a/content/common/cc_messages_unittest.cc
+++ b/content/common/cc_messages_unittest.cc
@@ -55,6 +55,7 @@ class CCMessagesTest : public testing::Test {
EXPECT_EQ(a->clip_rect, b->clip_rect);
EXPECT_EQ(a->is_clipped, b->is_clipped);
EXPECT_EQ(a->opacity, b->opacity);
+ EXPECT_EQ(a->blend_mode, b->blend_mode);
}
void Compare(const DrawQuad* a, const DrawQuad* b) {
@@ -230,6 +231,9 @@ TEST_F(CCMessagesTest, AllQuads) {
bool arbitrary_bool3 = true;
int arbitrary_int = 5;
SkColor arbitrary_color = SkColorSetARGB(25, 36, 47, 58);
+ SkXfermode::Mode arbitrary_blend_mode1 = SkXfermode::kScreen_Mode;
+ SkXfermode::Mode arbitrary_blend_mode2 = SkXfermode::kLighten_Mode;
+ SkXfermode::Mode arbitrary_blend_mode3 = SkXfermode::kOverlay_Mode;
IOSurfaceDrawQuad::Orientation arbitrary_orientation =
IOSurfaceDrawQuad::UNFLIPPED;
RenderPass::Id arbitrary_id(10, 14);
@@ -257,7 +261,8 @@ TEST_F(CCMessagesTest, AllQuads) {
arbitrary_rect1,
arbitrary_rect2,
arbitrary_bool1,
- arbitrary_float1);
+ arbitrary_float1,
+ arbitrary_blend_mode1);
scoped_ptr<SharedQuadState> shared_state1_cmp = shared_state1_in->Copy();
scoped_ptr<CheckerboardDrawQuad> checkerboard_in =
@@ -319,7 +324,8 @@ TEST_F(CCMessagesTest, AllQuads) {
arbitrary_rect2,
arbitrary_rect3,
arbitrary_bool1,
- arbitrary_float2);
+ arbitrary_float2,
+ arbitrary_blend_mode2);
scoped_ptr<SharedQuadState> shared_state2_cmp = shared_state2_in->Copy();
scoped_ptr<SharedQuadState> shared_state3_in = SharedQuadState::Create();
@@ -328,7 +334,8 @@ TEST_F(CCMessagesTest, AllQuads) {
arbitrary_rect3,
arbitrary_rect1,
arbitrary_bool1,
- arbitrary_float3);
+ arbitrary_float3,
+ arbitrary_blend_mode3);
scoped_ptr<SharedQuadState> shared_state3_cmp = shared_state3_in->Copy();
scoped_ptr<SolidColorDrawQuad> solidcolor_in =
« cc/trees/occlusion_tracker.cc ('K') | « content/common/cc_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698