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

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

Issue 1142343008: cc: Rework overlays to not use the ResourceProvider and pass texture size (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix more tests Created 5 years, 6 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
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/render_pass.h" 5 #include "cc/quads/render_pass.h"
6 #include "cc/quads/solid_color_draw_quad.h" 6 #include "cc/quads/solid_color_draw_quad.h"
7 #include "cc/quads/surface_draw_quad.h" 7 #include "cc/quads/surface_draw_quad.h"
8 #include "cc/quads/texture_draw_quad.h" 8 #include "cc/quads/texture_draw_quad.h"
9 #include "cc/resources/resource_provider.h" 9 #include "cc/resources/resource_provider.h"
10 #include "gpu/command_buffer/common/mailbox.h" 10 #include "gpu/command_buffer/common/mailbox.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 cc::TextureDrawQuad* texture_quad = 104 cc::TextureDrawQuad* texture_quad =
105 pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>(); 105 pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>();
106 unsigned resource_id = 9; 106 unsigned resource_id = 9;
107 bool premultiplied_alpha = true; 107 bool premultiplied_alpha = true;
108 gfx::PointF uv_top_left(1.7f, 2.1f); 108 gfx::PointF uv_top_left(1.7f, 2.1f);
109 gfx::PointF uv_bottom_right(-7.f, 16.3f); 109 gfx::PointF uv_bottom_right(-7.f, 16.3f);
110 SkColor background_color = SK_ColorYELLOW; 110 SkColor background_color = SK_ColorYELLOW;
111 float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f}; 111 float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f};
112 bool y_flipped = false; 112 bool y_flipped = false;
113 bool nearest_neighbor = false; 113 bool nearest_neighbor = false;
114 texture_quad->SetAll(sqs, 114 bool allow_overlay = false;
115 rect, 115 texture_quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
116 opaque_rect, 116 resource_id, gfx::Size(), allow_overlay,
117 visible_rect, 117 premultiplied_alpha, uv_top_left, uv_bottom_right,
118 needs_blending, 118 background_color, vertex_opacity, y_flipped,
119 resource_id,
120 premultiplied_alpha,
121 uv_top_left,
122 uv_bottom_right,
123 background_color,
124 vertex_opacity,
125 y_flipped,
126 nearest_neighbor); 119 nearest_neighbor);
127 120
128 QuadPtr mojo_quad = Quad::From<cc::DrawQuad>(*texture_quad); 121 QuadPtr mojo_quad = Quad::From<cc::DrawQuad>(*texture_quad);
129 ASSERT_FALSE(mojo_quad.is_null()); 122 ASSERT_FALSE(mojo_quad.is_null());
130 EXPECT_EQ(MATERIAL_TEXTURE_CONTENT, mojo_quad->material); 123 EXPECT_EQ(MATERIAL_TEXTURE_CONTENT, mojo_quad->material);
131 ASSERT_TRUE(mojo_quad->texture_quad_state); 124 ASSERT_TRUE(mojo_quad->texture_quad_state);
132 TextureQuadStatePtr& mojo_texture_state = mojo_quad->texture_quad_state; 125 TextureQuadStatePtr& mojo_texture_state = mojo_quad->texture_quad_state;
133 EXPECT_EQ(resource_id, mojo_texture_state->resource_id); 126 EXPECT_EQ(resource_id, mojo_texture_state->resource_id);
134 EXPECT_EQ(premultiplied_alpha, mojo_texture_state->premultiplied_alpha); 127 EXPECT_EQ(premultiplied_alpha, mojo_texture_state->premultiplied_alpha);
135 EXPECT_EQ(PointF::From(uv_top_left), mojo_texture_state->uv_top_left); 128 EXPECT_EQ(PointF::From(uv_top_left), mojo_texture_state->uv_top_left);
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 cc::TextureDrawQuad* texture_quad = 264 cc::TextureDrawQuad* texture_quad =
272 pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>(); 265 pass->CreateAndAppendDrawQuad<cc::TextureDrawQuad>();
273 unsigned resource_id = 9; 266 unsigned resource_id = 9;
274 bool premultiplied_alpha = true; 267 bool premultiplied_alpha = true;
275 gfx::PointF uv_top_left(1.7f, 2.1f); 268 gfx::PointF uv_top_left(1.7f, 2.1f);
276 gfx::PointF uv_bottom_right(-7.f, 16.3f); 269 gfx::PointF uv_bottom_right(-7.f, 16.3f);
277 SkColor background_color = SK_ColorYELLOW; 270 SkColor background_color = SK_ColorYELLOW;
278 float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f}; 271 float vertex_opacity[4] = {0.1f, 0.5f, 0.4f, 0.8f};
279 bool y_flipped = false; 272 bool y_flipped = false;
280 bool nearest_neighbor = false; 273 bool nearest_neighbor = false;
281 texture_quad->SetAll(sqs, 274 bool allow_overlay = false;
282 rect, 275 texture_quad->SetAll(sqs, rect, opaque_rect, visible_rect, needs_blending,
283 opaque_rect, 276 resource_id, gfx::Size(), allow_overlay,
284 visible_rect, 277 premultiplied_alpha, uv_top_left, uv_bottom_right,
285 needs_blending, 278 background_color, vertex_opacity, y_flipped,
286 resource_id,
287 premultiplied_alpha,
288 uv_top_left,
289 uv_bottom_right,
290 background_color,
291 vertex_opacity,
292 y_flipped,
293 nearest_neighbor); 279 nearest_neighbor);
294 280
295 PassPtr mojo_pass = Pass::From(*pass); 281 PassPtr mojo_pass = Pass::From(*pass);
296 ASSERT_FALSE(mojo_pass.is_null()); 282 ASSERT_FALSE(mojo_pass.is_null());
297 EXPECT_EQ(6, mojo_pass->id->index); 283 EXPECT_EQ(6, mojo_pass->id->index);
298 EXPECT_EQ(Rect::From(output_rect), mojo_pass->output_rect); 284 EXPECT_EQ(Rect::From(output_rect), mojo_pass->output_rect);
299 EXPECT_EQ(Rect::From(damage_rect), mojo_pass->damage_rect); 285 EXPECT_EQ(Rect::From(damage_rect), mojo_pass->damage_rect);
300 EXPECT_EQ(Transform::From(transform_to_root_target), 286 EXPECT_EQ(Transform::From(transform_to_root_target),
301 mojo_pass->transform_to_root_target); 287 mojo_pass->transform_to_root_target);
302 EXPECT_EQ(has_transparent_background, mojo_pass->has_transparent_background); 288 EXPECT_EQ(has_transparent_background, mojo_pass->has_transparent_background);
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 cc::ReturnedResource round_trip_resource = 449 cc::ReturnedResource round_trip_resource =
464 mojo_resource.To<cc::ReturnedResource>(); 450 mojo_resource.To<cc::ReturnedResource>();
465 EXPECT_EQ(id, round_trip_resource.id); 451 EXPECT_EQ(id, round_trip_resource.id);
466 EXPECT_EQ(sync_point, round_trip_resource.sync_point); 452 EXPECT_EQ(sync_point, round_trip_resource.sync_point);
467 EXPECT_EQ(count, round_trip_resource.count); 453 EXPECT_EQ(count, round_trip_resource.count);
468 EXPECT_EQ(lost, round_trip_resource.lost); 454 EXPECT_EQ(lost, round_trip_resource.lost);
469 } 455 }
470 456
471 } // namespace 457 } // namespace
472 } // namespace mojo 458 } // namespace mojo
OLDNEW
« cc/quads/texture_draw_quad.cc ('K') | « 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