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

Side by Side Diff: mojo/converters/surfaces/tests/surface_unittest.cc

Issue 1387283002: cc: Remove redundant is_overlay arguments (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo changes on overlay_strategy_single_on_top.cc Created 5 years, 2 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
« no previous file with comments | « mojo/converters/surfaces/surfaces_type_converters.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/debug_border_draw_quad.h" 5 #include "cc/quads/debug_border_draw_quad.h"
6 #include "cc/quads/render_pass.h" 6 #include "cc/quads/render_pass.h"
7 #include "cc/quads/solid_color_draw_quad.h" 7 #include "cc/quads/solid_color_draw_quad.h"
8 #include "cc/quads/surface_draw_quad.h" 8 #include "cc/quads/surface_draw_quad.h"
9 #include "cc/quads/texture_draw_quad.h" 9 #include "cc/quads/texture_draw_quad.h"
10 #include "cc/resources/resource_provider.h" 10 #include "cc/resources/resource_provider.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 cc::TextureDrawQuad* texture_quad = 105 cc::TextureDrawQuad* texture_quad =
106 pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>(); 106 pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>();
107 unsigned resource_id = 9; 107 unsigned resource_id = 9;
108 bool premultiplied_alpha = true; 108 bool premultiplied_alpha = true;
109 gfx::PointF uv_top_left(1.7f, 2.1f); 109 gfx::PointF uv_top_left(1.7f, 2.1f);
110 gfx::PointF uv_bottom_right(-7.f, 16.3f); 110 gfx::PointF uv_bottom_right(-7.f, 16.3f);
111 SkColor background_color = SK_ColorYELLOW; 111 SkColor background_color = SK_ColorYELLOW;
112 float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f}; 112 float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f};
113 bool y_flipped = false; 113 bool y_flipped = false;
114 bool nearest_neighbor = false; 114 bool nearest_neighbor = false;
115 bool allow_overlay = false;
116 texture_quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending, 115 texture_quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
117 resource_id, gfx::Size(), allow_overlay, 116 resource_id, gfx::Size(), premultiplied_alpha,
118 premultiplied_alpha, uv_top_left, uv_bottom_right, 117 uv_top_left, uv_bottom_right, background_color,
119 background_color, vertex_opacity, y_flipped, 118 vertex_opacity, y_flipped, nearest_neighbor);
120 nearest_neighbor);
121 119
122 QuadPtr mojo_quad = Quad::From<cc::DrawQuad>(*texture_quad); 120 QuadPtr mojo_quad = Quad::From<cc::DrawQuad>(*texture_quad);
123 ASSERT_FALSE(mojo_quad.is_null()); 121 ASSERT_FALSE(mojo_quad.is_null());
124 EXPECT_EQ(MATERIAL_TEXTURE_CONTENT, mojo_quad->material); 122 EXPECT_EQ(MATERIAL_TEXTURE_CONTENT, mojo_quad->material);
125 ASSERT_TRUE(mojo_quad->texture_quad_state); 123 ASSERT_TRUE(mojo_quad->texture_quad_state);
126 TextureQuadStatePtr& mojo_texture_state = mojo_quad->texture_quad_state; 124 TextureQuadStatePtr& mojo_texture_state = mojo_quad->texture_quad_state;
127 EXPECT_EQ(resource_id, mojo_texture_state->resource_id); 125 EXPECT_EQ(resource_id, mojo_texture_state->resource_id);
128 EXPECT_EQ(premultiplied_alpha, mojo_texture_state->premultiplied_alpha); 126 EXPECT_EQ(premultiplied_alpha, mojo_texture_state->premultiplied_alpha);
129 EXPECT_TRUE( 127 EXPECT_TRUE(
130 PointF::From(uv_top_left).Equals(mojo_texture_state->uv_top_left)); 128 PointF::From(uv_top_left).Equals(mojo_texture_state->uv_top_left));
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 cc::TextureDrawQuad* texture_quad = 257 cc::TextureDrawQuad* texture_quad =
260 pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>(); 258 pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>();
261 unsigned resource_id = 9; 259 unsigned resource_id = 9;
262 bool premultiplied_alpha = true; 260 bool premultiplied_alpha = true;
263 gfx::PointF uv_top_left(1.7f, 2.1f); 261 gfx::PointF uv_top_left(1.7f, 2.1f);
264 gfx::PointF uv_bottom_right(-7.f, 16.3f); 262 gfx::PointF uv_bottom_right(-7.f, 16.3f);
265 SkColor background_color = SK_ColorYELLOW; 263 SkColor background_color = SK_ColorYELLOW;
266 float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f}; 264 float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f};
267 bool y_flipped = false; 265 bool y_flipped = false;
268 bool nearest_neighbor = false; 266 bool nearest_neighbor = false;
269 bool allow_overlay = false;
270 texture_quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending, 267 texture_quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
271 resource_id, gfx::Size(), allow_overlay, 268 resource_id, gfx::Size(), premultiplied_alpha,
272 premultiplied_alpha, uv_top_left, uv_bottom_right, 269 uv_top_left, uv_bottom_right, background_color,
273 background_color, vertex_opacity, y_flipped, 270 vertex_opacity, y_flipped, nearest_neighbor);
274 nearest_neighbor);
275 271
276 PassPtr mojo_pass = Pass::From(*pass); 272 PassPtr mojo_pass = Pass::From(*pass);
277 ASSERT_FALSE(mojo_pass.is_null()); 273 ASSERT_FALSE(mojo_pass.is_null());
278 EXPECT_EQ(6u, mojo_pass->id->index); 274 EXPECT_EQ(6u, mojo_pass->id->index);
279 EXPECT_TRUE(Rect::From(output_rect).Equals(mojo_pass->output_rect)); 275 EXPECT_TRUE(Rect::From(output_rect).Equals(mojo_pass->output_rect));
280 EXPECT_TRUE(Rect::From(damage_rect).Equals(mojo_pass->damage_rect)); 276 EXPECT_TRUE(Rect::From(damage_rect).Equals(mojo_pass->damage_rect));
281 EXPECT_TRUE(Transform::From(transform_to_root_target) 277 EXPECT_TRUE(Transform::From(transform_to_root_target)
282 .Equals(mojo_pass->transform_to_root_target)); 278 .Equals(mojo_pass->transform_to_root_target));
283 EXPECT_EQ(has_transparent_background, mojo_pass->has_transparent_background); 279 EXPECT_EQ(has_transparent_background, mojo_pass->has_transparent_background);
284 ASSERT_EQ(1u, mojo_pass->shared_quad_states.size()); 280 ASSERT_EQ(1u, mojo_pass->shared_quad_states.size());
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 ASSERT_TRUE(mojo_quad->debug_border_quad_state); 467 ASSERT_TRUE(mojo_quad->debug_border_quad_state);
472 DebugBorderQuadStatePtr& mojo_debug_border_state = 468 DebugBorderQuadStatePtr& mojo_debug_border_state =
473 mojo_quad->debug_border_quad_state; 469 mojo_quad->debug_border_quad_state;
474 EXPECT_TRUE( 470 EXPECT_TRUE(
475 Color::From(arbitrary_color).Equals(mojo_debug_border_state->color)); 471 Color::From(arbitrary_color).Equals(mojo_debug_border_state->color));
476 EXPECT_EQ(width, mojo_debug_border_state->width); 472 EXPECT_EQ(width, mojo_debug_border_state->width);
477 } 473 }
478 474
479 } // namespace 475 } // namespace
480 } // namespace mojo 476 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/converters/surfaces/surfaces_type_converters.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698