Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "content/common/cc_messages.h" | 5 #include "content/common/cc_messages.h" |
| 6 | 6 |
| 7 #include <string.h> | 7 #include <string.h> |
| 8 | 8 |
| 9 #include "cc/compositor_frame.h" | 9 #include "cc/compositor_frame.h" |
| 10 #include "ipc/ipc_message.h" | 10 #include "ipc/ipc_message.h" |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 40 EXPECT_EQ(a->output_rect.ToString(), b->output_rect.ToString()); | 40 EXPECT_EQ(a->output_rect.ToString(), b->output_rect.ToString()); |
| 41 EXPECT_EQ(a->damage_rect.ToString(), b->damage_rect.ToString()); | 41 EXPECT_EQ(a->damage_rect.ToString(), b->damage_rect.ToString()); |
| 42 EXPECT_EQ(a->transform_to_root_target, b->transform_to_root_target); | 42 EXPECT_EQ(a->transform_to_root_target, b->transform_to_root_target); |
| 43 EXPECT_EQ(a->has_transparent_background, b->has_transparent_background); | 43 EXPECT_EQ(a->has_transparent_background, b->has_transparent_background); |
| 44 EXPECT_EQ(a->has_occlusion_from_outside_target_surface, | 44 EXPECT_EQ(a->has_occlusion_from_outside_target_surface, |
| 45 b->has_occlusion_from_outside_target_surface); | 45 b->has_occlusion_from_outside_target_surface); |
| 46 } | 46 } |
| 47 | 47 |
| 48 void Compare(const SharedQuadState* a, const SharedQuadState* b) { | 48 void Compare(const SharedQuadState* a, const SharedQuadState* b) { |
| 49 EXPECT_EQ(a->content_to_target_transform, b->content_to_target_transform); | 49 EXPECT_EQ(a->content_to_target_transform, b->content_to_target_transform); |
| 50 EXPECT_EQ(a->visible_content_rect, b->visible_content_rect); | 50 EXPECT_EQ(a->visible_content_rect, b->visible_content_rect); |
|
danakj
2013/02/26 22:11:21
Thanks! Can you also compare the content_bounds in
ernstm
2013/02/26 22:28:26
Done.
| |
| 51 EXPECT_EQ(a->clip_rect, b->clip_rect); | 51 EXPECT_EQ(a->clip_rect, b->clip_rect); |
| 52 EXPECT_EQ(a->is_clipped, b->is_clipped); | 52 EXPECT_EQ(a->is_clipped, b->is_clipped); |
| 53 EXPECT_EQ(a->opacity, b->opacity); | 53 EXPECT_EQ(a->opacity, b->opacity); |
| 54 } | 54 } |
| 55 | 55 |
| 56 void Compare(const DrawQuad* a, const DrawQuad* b) { | 56 void Compare(const DrawQuad* a, const DrawQuad* b) { |
| 57 ASSERT_NE(DrawQuad::INVALID, a->material); | 57 ASSERT_NE(DrawQuad::INVALID, a->material); |
| 58 ASSERT_EQ(a->material, b->material); | 58 ASSERT_EQ(a->material, b->material); |
| 59 EXPECT_EQ(a->rect.ToString(), b->rect.ToString()); | 59 EXPECT_EQ(a->rect.ToString(), b->rect.ToString()); |
| 60 EXPECT_EQ(a->opaque_rect.ToString(), b->opaque_rect.ToString()); | 60 EXPECT_EQ(a->opaque_rect.ToString(), b->opaque_rect.ToString()); |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 150 EXPECT_EQ(a->vertex_opacity[2], b->vertex_opacity[2]); | 150 EXPECT_EQ(a->vertex_opacity[2], b->vertex_opacity[2]); |
| 151 EXPECT_EQ(a->vertex_opacity[3], b->vertex_opacity[3]); | 151 EXPECT_EQ(a->vertex_opacity[3], b->vertex_opacity[3]); |
| 152 EXPECT_EQ(a->flipped, b->flipped); | 152 EXPECT_EQ(a->flipped, b->flipped); |
| 153 } | 153 } |
| 154 | 154 |
| 155 void Compare(const TileDrawQuad* a, const TileDrawQuad* b) { | 155 void Compare(const TileDrawQuad* a, const TileDrawQuad* b) { |
| 156 EXPECT_EQ(a->resource_id, b->resource_id); | 156 EXPECT_EQ(a->resource_id, b->resource_id); |
| 157 EXPECT_EQ(a->tex_coord_rect, b->tex_coord_rect); | 157 EXPECT_EQ(a->tex_coord_rect, b->tex_coord_rect); |
| 158 EXPECT_EQ(a->texture_size, b->texture_size); | 158 EXPECT_EQ(a->texture_size, b->texture_size); |
| 159 EXPECT_EQ(a->swizzle_contents, b->swizzle_contents); | 159 EXPECT_EQ(a->swizzle_contents, b->swizzle_contents); |
| 160 EXPECT_EQ(a->left_edge_aa, b->left_edge_aa); | |
| 161 EXPECT_EQ(a->top_edge_aa, b->top_edge_aa); | |
| 162 EXPECT_EQ(a->right_edge_aa, b->right_edge_aa); | |
| 163 EXPECT_EQ(a->bottom_edge_aa, b->bottom_edge_aa); | |
| 164 } | 160 } |
| 165 | 161 |
| 166 void Compare(const YUVVideoDrawQuad* a, const YUVVideoDrawQuad* b) { | 162 void Compare(const YUVVideoDrawQuad* a, const YUVVideoDrawQuad* b) { |
| 167 EXPECT_EQ(a->tex_scale, b->tex_scale); | 163 EXPECT_EQ(a->tex_scale, b->tex_scale); |
| 168 EXPECT_EQ(a->y_plane.resourceId, b->y_plane.resourceId); | 164 EXPECT_EQ(a->y_plane.resourceId, b->y_plane.resourceId); |
| 169 EXPECT_EQ(a->y_plane.size.ToString(), b->y_plane.size.ToString()); | 165 EXPECT_EQ(a->y_plane.size.ToString(), b->y_plane.size.ToString()); |
| 170 EXPECT_EQ(a->y_plane.format, b->y_plane.format); | 166 EXPECT_EQ(a->y_plane.format, b->y_plane.format); |
| 171 EXPECT_EQ(a->u_plane.resourceId, b->u_plane.resourceId); | 167 EXPECT_EQ(a->u_plane.resourceId, b->u_plane.resourceId); |
| 172 EXPECT_EQ(a->u_plane.size.ToString(), b->u_plane.size.ToString()); | 168 EXPECT_EQ(a->u_plane.size.ToString(), b->u_plane.size.ToString()); |
| 173 EXPECT_EQ(a->u_plane.format, b->u_plane.format); | 169 EXPECT_EQ(a->u_plane.format, b->u_plane.format); |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 202 gfx::SizeF arbitrary_sizef1(15.2f, 104.6f); | 198 gfx::SizeF arbitrary_sizef1(15.2f, 104.6f); |
| 203 gfx::PointF arbitrary_pointf1(31.4f, 15.9f); | 199 gfx::PointF arbitrary_pointf1(31.4f, 15.9f); |
| 204 gfx::PointF arbitrary_pointf2(26.5f, -35.8f); | 200 gfx::PointF arbitrary_pointf2(26.5f, -35.8f); |
| 205 float arbitrary_float1 = 0.7f; | 201 float arbitrary_float1 = 0.7f; |
| 206 float arbitrary_float2 = 0.3f; | 202 float arbitrary_float2 = 0.3f; |
| 207 float arbitrary_float3 = 0.9f; | 203 float arbitrary_float3 = 0.9f; |
| 208 float arbitrary_float_array[4] = {3.5f, 6.2f, 9.3f, 12.3f}; | 204 float arbitrary_float_array[4] = {3.5f, 6.2f, 9.3f, 12.3f}; |
| 209 bool arbitrary_bool1 = true; | 205 bool arbitrary_bool1 = true; |
| 210 bool arbitrary_bool2 = false; | 206 bool arbitrary_bool2 = false; |
| 211 bool arbitrary_bool3 = true; | 207 bool arbitrary_bool3 = true; |
| 212 bool arbitrary_bool4 = true; | |
| 213 bool arbitrary_bool5 = false; | |
| 214 bool arbitrary_bool6 = true; | |
| 215 int arbitrary_int = 5; | 208 int arbitrary_int = 5; |
| 216 SkColor arbitrary_color = SkColorSetARGB(25, 36, 47, 58); | 209 SkColor arbitrary_color = SkColorSetARGB(25, 36, 47, 58); |
| 217 IOSurfaceDrawQuad::Orientation arbitrary_orientation = | 210 IOSurfaceDrawQuad::Orientation arbitrary_orientation = |
| 218 IOSurfaceDrawQuad::UNFLIPPED; | 211 IOSurfaceDrawQuad::UNFLIPPED; |
| 219 RenderPass::Id arbitrary_id(10, 14); | 212 RenderPass::Id arbitrary_id(10, 14); |
| 220 ResourceProvider::ResourceId arbitrary_resourceid = 55; | 213 ResourceProvider::ResourceId arbitrary_resourceid = 55; |
| 221 | 214 |
| 222 VideoLayerImpl::FramePlane arbitrary_plane1; | 215 VideoLayerImpl::FramePlane arbitrary_plane1; |
| 223 arbitrary_plane1.resourceId = arbitrary_resourceid; | 216 arbitrary_plane1.resourceId = arbitrary_resourceid; |
| 224 arbitrary_plane1.size = arbitrary_size1; | 217 arbitrary_plane1.size = arbitrary_size1; |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 240 | 233 |
| 241 WebFilterOperations arbitrary_filters2; | 234 WebFilterOperations arbitrary_filters2; |
| 242 arbitrary_filters2.append(WebFilterOperation::createBrightnessFilter( | 235 arbitrary_filters2.append(WebFilterOperation::createBrightnessFilter( |
| 243 arbitrary_float2)); | 236 arbitrary_float2)); |
| 244 | 237 |
| 245 // TODO(danakj): filter is not serialized. | 238 // TODO(danakj): filter is not serialized. |
| 246 skia::RefPtr<SkImageFilter> arbitrary_filter; | 239 skia::RefPtr<SkImageFilter> arbitrary_filter; |
| 247 | 240 |
| 248 scoped_ptr<SharedQuadState> shared_state1_in = SharedQuadState::Create(); | 241 scoped_ptr<SharedQuadState> shared_state1_in = SharedQuadState::Create(); |
| 249 shared_state1_in->SetAll(arbitrary_matrix, | 242 shared_state1_in->SetAll(arbitrary_matrix, |
| 243 arbitrary_size1, | |
| 250 arbitrary_rect1, | 244 arbitrary_rect1, |
| 251 arbitrary_rect2, | 245 arbitrary_rect2, |
| 252 arbitrary_bool1, | 246 arbitrary_bool1, |
| 253 arbitrary_float1); | 247 arbitrary_float1); |
| 254 scoped_ptr<SharedQuadState> shared_state1_cmp = shared_state1_in->Copy(); | 248 scoped_ptr<SharedQuadState> shared_state1_cmp = shared_state1_in->Copy(); |
| 255 | 249 |
| 256 scoped_ptr<CheckerboardDrawQuad> checkerboard_in = | 250 scoped_ptr<CheckerboardDrawQuad> checkerboard_in = |
| 257 CheckerboardDrawQuad::Create(); | 251 CheckerboardDrawQuad::Create(); |
| 258 checkerboard_in->SetAll(shared_state1_in.get(), | 252 checkerboard_in->SetAll(shared_state1_in.get(), |
| 259 arbitrary_rect1, | 253 arbitrary_rect1, |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 302 arbitrary_rect1, | 296 arbitrary_rect1, |
| 303 arbitrary_rectf1, | 297 arbitrary_rectf1, |
| 304 arbitrary_filters1, | 298 arbitrary_filters1, |
| 305 arbitrary_filter, // TODO(piman): not serialized. | 299 arbitrary_filter, // TODO(piman): not serialized. |
| 306 arbitrary_filters2); | 300 arbitrary_filters2); |
| 307 scoped_ptr<RenderPassDrawQuad> renderpass_cmp = renderpass_in->Copy( | 301 scoped_ptr<RenderPassDrawQuad> renderpass_cmp = renderpass_in->Copy( |
| 308 renderpass_in->shared_quad_state, renderpass_in->render_pass_id); | 302 renderpass_in->shared_quad_state, renderpass_in->render_pass_id); |
| 309 | 303 |
| 310 scoped_ptr<SharedQuadState> shared_state2_in = SharedQuadState::Create(); | 304 scoped_ptr<SharedQuadState> shared_state2_in = SharedQuadState::Create(); |
| 311 shared_state2_in->SetAll(arbitrary_matrix, | 305 shared_state2_in->SetAll(arbitrary_matrix, |
| 306 arbitrary_size2, | |
| 312 arbitrary_rect2, | 307 arbitrary_rect2, |
| 313 arbitrary_rect3, | 308 arbitrary_rect3, |
| 314 arbitrary_bool1, | 309 arbitrary_bool1, |
| 315 arbitrary_float2); | 310 arbitrary_float2); |
| 316 scoped_ptr<SharedQuadState> shared_state2_cmp = shared_state2_in->Copy(); | 311 scoped_ptr<SharedQuadState> shared_state2_cmp = shared_state2_in->Copy(); |
| 317 | 312 |
| 318 scoped_ptr<SharedQuadState> shared_state3_in = SharedQuadState::Create(); | 313 scoped_ptr<SharedQuadState> shared_state3_in = SharedQuadState::Create(); |
| 319 shared_state3_in->SetAll(arbitrary_matrix, | 314 shared_state3_in->SetAll(arbitrary_matrix, |
| 315 arbitrary_size3, | |
| 320 arbitrary_rect3, | 316 arbitrary_rect3, |
| 321 arbitrary_rect1, | 317 arbitrary_rect1, |
| 322 arbitrary_bool1, | 318 arbitrary_bool1, |
| 323 arbitrary_float3); | 319 arbitrary_float3); |
| 324 scoped_ptr<SharedQuadState> shared_state3_cmp = shared_state3_in->Copy(); | 320 scoped_ptr<SharedQuadState> shared_state3_cmp = shared_state3_in->Copy(); |
| 325 | 321 |
| 326 scoped_ptr<SolidColorDrawQuad> solidcolor_in = | 322 scoped_ptr<SolidColorDrawQuad> solidcolor_in = |
| 327 SolidColorDrawQuad::Create(); | 323 SolidColorDrawQuad::Create(); |
| 328 solidcolor_in->SetAll(shared_state1_in.get(), | 324 solidcolor_in->SetAll(shared_state1_in.get(), |
| 329 arbitrary_rect3, | 325 arbitrary_rect3, |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 363 | 359 |
| 364 scoped_ptr<TileDrawQuad> tile_in = TileDrawQuad::Create(); | 360 scoped_ptr<TileDrawQuad> tile_in = TileDrawQuad::Create(); |
| 365 tile_in->SetAll(shared_state1_in.get(), | 361 tile_in->SetAll(shared_state1_in.get(), |
| 366 arbitrary_rect2, | 362 arbitrary_rect2, |
| 367 arbitrary_rect3, | 363 arbitrary_rect3, |
| 368 arbitrary_rect1, | 364 arbitrary_rect1, |
| 369 arbitrary_bool1, | 365 arbitrary_bool1, |
| 370 arbitrary_resourceid, | 366 arbitrary_resourceid, |
| 371 arbitrary_rectf1, | 367 arbitrary_rectf1, |
| 372 arbitrary_size1, | 368 arbitrary_size1, |
| 373 arbitrary_bool2, | 369 arbitrary_bool2); |
| 374 arbitrary_bool3, | |
| 375 arbitrary_bool4, | |
| 376 arbitrary_bool5, | |
| 377 arbitrary_bool6); | |
| 378 scoped_ptr<DrawQuad> tile_cmp = tile_in->Copy( | 370 scoped_ptr<DrawQuad> tile_cmp = tile_in->Copy( |
| 379 tile_in->shared_quad_state); | 371 tile_in->shared_quad_state); |
| 380 | 372 |
| 381 scoped_ptr<YUVVideoDrawQuad> yuvvideo_in = | 373 scoped_ptr<YUVVideoDrawQuad> yuvvideo_in = |
| 382 YUVVideoDrawQuad::Create(); | 374 YUVVideoDrawQuad::Create(); |
| 383 yuvvideo_in->SetAll(shared_state1_in.get(), | 375 yuvvideo_in->SetAll(shared_state1_in.get(), |
| 384 arbitrary_rect1, | 376 arbitrary_rect1, |
| 385 arbitrary_rect2, | 377 arbitrary_rect2, |
| 386 arbitrary_rect3, | 378 arbitrary_rect3, |
| 387 arbitrary_bool1, | 379 arbitrary_bool1, |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 532 | 524 |
| 533 EXPECT_EQ(arbitrary_uint, frame_out.resource_list.sync_point); | 525 EXPECT_EQ(arbitrary_uint, frame_out.resource_list.sync_point); |
| 534 | 526 |
| 535 EXPECT_EQ(2u, frame_out.resource_list.resources.size()); | 527 EXPECT_EQ(2u, frame_out.resource_list.resources.size()); |
| 536 Compare(arbitrary_resource1, frame_out.resource_list.resources[0]); | 528 Compare(arbitrary_resource1, frame_out.resource_list.resources[0]); |
| 537 Compare(arbitrary_resource2, frame_out.resource_list.resources[1]); | 529 Compare(arbitrary_resource2, frame_out.resource_list.resources[1]); |
| 538 } | 530 } |
| 539 | 531 |
| 540 } // namespace | 532 } // namespace |
| 541 } // namespace content | 533 } // namespace content |
| OLD | NEW |