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

Unified Diff: cc/quads/draw_quad_unittest.cc

Issue 1968363002: SurfaceAggregator should check whether output is secure when drawin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/quads/draw_quad_perftest.cc ('k') | cc/quads/texture_draw_quad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/draw_quad_unittest.cc
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index 8360f1ed3300a72406f83db8c37ae274d8ec232f..ca3ed046eb93bca4ba5845c8d9d1a887bc10ad8c 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -557,19 +557,13 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
bool y_flipped = true;
bool nearest_neighbor = true;
+ bool secure_output_only = true;
CREATE_SHARED_STATE();
- CREATE_QUAD_10_NEW(TextureDrawQuad,
- opaque_rect,
- visible_rect,
- resource_id,
- premultiplied_alpha,
- uv_top_left,
- uv_bottom_right,
- SK_ColorTRANSPARENT,
- vertex_opacity,
- y_flipped,
- nearest_neighbor);
+ CREATE_QUAD_11_NEW(TextureDrawQuad, opaque_rect, visible_rect, resource_id,
+ premultiplied_alpha, uv_top_left, uv_bottom_right,
+ SK_ColorTRANSPARENT, vertex_opacity, y_flipped,
+ nearest_neighbor, secure_output_only);
EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
EXPECT_EQ(visible_rect, copy_quad->visible_rect);
EXPECT_EQ(opaque_rect, copy_quad->opaque_rect);
@@ -580,11 +574,12 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copy_quad->vertex_opacity, 4);
EXPECT_EQ(y_flipped, copy_quad->y_flipped);
EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor);
+ EXPECT_EQ(secure_output_only, copy_quad->secure_output_only);
- CREATE_QUAD_9_ALL(TextureDrawQuad, resource_id, resource_size_in_pixels,
- premultiplied_alpha, uv_top_left, uv_bottom_right,
- SK_ColorTRANSPARENT, vertex_opacity, y_flipped,
- nearest_neighbor);
+ CREATE_QUAD_10_ALL(TextureDrawQuad, resource_id, resource_size_in_pixels,
+ premultiplied_alpha, uv_top_left, uv_bottom_right,
+ SK_ColorTRANSPARENT, vertex_opacity, y_flipped,
+ nearest_neighbor, secure_output_only);
EXPECT_EQ(DrawQuad::TEXTURE_CONTENT, copy_quad->material);
EXPECT_EQ(resource_id, copy_quad->resource_id());
EXPECT_EQ(resource_size_in_pixels, copy_quad->resource_size_in_pixels());
@@ -594,6 +589,7 @@ TEST(DrawQuadTest, CopyTextureDrawQuad) {
EXPECT_FLOAT_ARRAY_EQ(vertex_opacity, copy_quad->vertex_opacity, 4);
EXPECT_EQ(y_flipped, copy_quad->y_flipped);
EXPECT_EQ(nearest_neighbor, copy_quad->nearest_neighbor);
+ EXPECT_EQ(secure_output_only, copy_quad->secure_output_only);
}
TEST(DrawQuadTest, CopyTileDrawQuad) {
@@ -857,19 +853,13 @@ TEST_F(DrawQuadIteratorTest, TextureDrawQuad) {
const float vertex_opacity[] = { 1.0f, 1.0f, 1.0f, 1.0f };
bool y_flipped = true;
bool nearest_neighbor = true;
+ bool secure_output_only = true;
CREATE_SHARED_STATE();
- CREATE_QUAD_10_NEW(TextureDrawQuad,
- opaque_rect,
- visible_rect,
- resource_id,
- premultiplied_alpha,
- uv_top_left,
- uv_bottom_right,
- SK_ColorTRANSPARENT,
- vertex_opacity,
- y_flipped,
- nearest_neighbor);
+ CREATE_QUAD_11_NEW(TextureDrawQuad, opaque_rect, visible_rect, resource_id,
+ premultiplied_alpha, uv_top_left, uv_bottom_right,
+ SK_ColorTRANSPARENT, vertex_opacity, y_flipped,
+ nearest_neighbor, secure_output_only);
EXPECT_EQ(resource_id, quad_new->resource_id());
EXPECT_EQ(1, IterateAndCount(quad_new));
EXPECT_EQ(resource_id + 1, quad_new->resource_id());
« no previous file with comments | « cc/quads/draw_quad_perftest.cc ('k') | cc/quads/texture_draw_quad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698