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

Side by Side Diff: cc/draw_quad_unittest.cc

Issue 11570027: Adding support for per vertex opacity on textured layer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixing unittest Created 8 years 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
« no previous file with comments | « no previous file | cc/geometry_binding.cc » ('j') | cc/geometry_binding.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/draw_quad.h" 5 #include "cc/draw_quad.h"
6 6
7 #include "cc/checkerboard_draw_quad.h" 7 #include "cc/checkerboard_draw_quad.h"
8 #include "cc/debug_border_draw_quad.h" 8 #include "cc/debug_border_draw_quad.h"
9 #include "cc/io_surface_draw_quad.h" 9 #include "cc/io_surface_draw_quad.h"
10 #include "cc/math_util.h" 10 #include "cc/math_util.h"
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 EXPECT_EQ(textureId, copyQuad->texture_id); 329 EXPECT_EQ(textureId, copyQuad->texture_id);
330 EXPECT_EQ(matrix, copyQuad->matrix); 330 EXPECT_EQ(matrix, copyQuad->matrix);
331 } 331 }
332 332
333 TEST(DrawQuadTest, copyTextureDrawQuad) 333 TEST(DrawQuadTest, copyTextureDrawQuad)
334 { 334 {
335 gfx::Rect opaqueRect(3, 7, 10, 12); 335 gfx::Rect opaqueRect(3, 7, 10, 12);
336 unsigned resourceId = 82; 336 unsigned resourceId = 82;
337 bool premultipliedAlpha = true; 337 bool premultipliedAlpha = true;
338 gfx::RectF uvRect(0.5, 224, -51, 36); 338 gfx::RectF uvRect(0.5, 224, -51, 36);
339 const float vertex_opacity[] = {1, 1, 1, 1};
339 bool flipped = true; 340 bool flipped = true;
340 CREATE_SHARED_STATE(); 341 CREATE_SHARED_STATE();
341 342
342 CREATE_QUAD_5_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlph a, uvRect, flipped); 343 CREATE_QUAD_6_NEW(TextureDrawQuad, opaqueRect, resourceId, premultipliedAlph a, uvRect, vertex_opacity, flipped);
343 EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copyQuad->material); 344 EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copyQuad->material);
344 EXPECT_RECT_EQ(opaqueRect, copyQuad->opaque_rect); 345 EXPECT_RECT_EQ(opaqueRect, copyQuad->opaque_rect);
345 EXPECT_EQ(resourceId, copyQuad->resource_id); 346 EXPECT_EQ(resourceId, copyQuad->resource_id);
346 EXPECT_EQ(premultipliedAlpha, copyQuad->premultiplied_alpha); 347 EXPECT_EQ(premultipliedAlpha, copyQuad->premultiplied_alpha);
347 EXPECT_FLOAT_RECT_EQ(uvRect, copyQuad->uv_rect); 348 EXPECT_FLOAT_RECT_EQ(uvRect, copyQuad->uv_rect);
349 EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copyQuad->vertex_opacity, 4);
348 EXPECT_EQ(flipped, copyQuad->flipped); 350 EXPECT_EQ(flipped, copyQuad->flipped);
349 351
350 CREATE_QUAD_4_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvRect, f lipped); 352 CREATE_QUAD_5_ALL(TextureDrawQuad, resourceId, premultipliedAlpha, uvRect, v ertex_opacity, flipped);
351 EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copyQuad->material); 353 EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copyQuad->material);
352 EXPECT_EQ(resourceId, copyQuad->resource_id); 354 EXPECT_EQ(resourceId, copyQuad->resource_id);
353 EXPECT_EQ(premultipliedAlpha, copyQuad->premultiplied_alpha); 355 EXPECT_EQ(premultipliedAlpha, copyQuad->premultiplied_alpha);
354 EXPECT_FLOAT_RECT_EQ(uvRect, copyQuad->uv_rect); 356 EXPECT_FLOAT_RECT_EQ(uvRect, copyQuad->uv_rect);
357 EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copyQuad->vertex_opacity, 4);
355 EXPECT_EQ(flipped, copyQuad->flipped); 358 EXPECT_EQ(flipped, copyQuad->flipped);
356 } 359 }
357 360
358 TEST(DrawQuadTest, copyTileDrawQuad) 361 TEST(DrawQuadTest, copyTileDrawQuad)
359 { 362 {
360 gfx::Rect opaqueRect(33, 44, 22, 33); 363 gfx::Rect opaqueRect(33, 44, 22, 33);
361 unsigned resourceId = 104; 364 unsigned resourceId = 104;
362 gfx::RectF texCoordRect(31, 12, 54, 20); 365 gfx::RectF texCoordRect(31, 12, 54, 20);
363 gfx::Size textureSize(85, 32); 366 gfx::Size textureSize(85, 32);
364 bool swizzleContents = true; 367 bool swizzleContents = true;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 EXPECT_EQ(uPlane.resourceId, copyQuad->u_plane.resourceId); 436 EXPECT_EQ(uPlane.resourceId, copyQuad->u_plane.resourceId);
434 EXPECT_EQ(uPlane.size, copyQuad->u_plane.size); 437 EXPECT_EQ(uPlane.size, copyQuad->u_plane.size);
435 EXPECT_EQ(uPlane.format, copyQuad->u_plane.format); 438 EXPECT_EQ(uPlane.format, copyQuad->u_plane.format);
436 EXPECT_EQ(vPlane.resourceId, copyQuad->v_plane.resourceId); 439 EXPECT_EQ(vPlane.resourceId, copyQuad->v_plane.resourceId);
437 EXPECT_EQ(vPlane.size, copyQuad->v_plane.size); 440 EXPECT_EQ(vPlane.size, copyQuad->v_plane.size);
438 EXPECT_EQ(vPlane.format, copyQuad->v_plane.format); 441 EXPECT_EQ(vPlane.format, copyQuad->v_plane.format);
439 } 442 }
440 443
441 } // namespace 444 } // namespace
442 } // namespace cc 445 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/geometry_binding.cc » ('j') | cc/geometry_binding.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698