| 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 <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 396 streamvideo_in->SetAll(shared_state3_in, | 396 streamvideo_in->SetAll(shared_state3_in, |
| 397 arbitrary_rect2, | 397 arbitrary_rect2, |
| 398 arbitrary_rect2_inside_rect2, | 398 arbitrary_rect2_inside_rect2, |
| 399 arbitrary_rect1_inside_rect2, | 399 arbitrary_rect1_inside_rect2, |
| 400 arbitrary_bool1, | 400 arbitrary_bool1, |
| 401 arbitrary_resourceid2, | 401 arbitrary_resourceid2, |
| 402 arbitrary_matrix); | 402 arbitrary_matrix); |
| 403 scoped_ptr<DrawQuad> streamvideo_cmp = streamvideo_in->Copy( | 403 scoped_ptr<DrawQuad> streamvideo_cmp = streamvideo_in->Copy( |
| 404 streamvideo_in->shared_quad_state); | 404 streamvideo_in->shared_quad_state); |
| 405 | 405 |
| 406 int arbitrary_surface_id = 3; | 406 cc::SurfaceId arbitrary_surface_id; |
| 407 arbitrary_surface_id.id = 3; |
| 407 scoped_ptr<SurfaceDrawQuad> surface_in = SurfaceDrawQuad::Create(); | 408 scoped_ptr<SurfaceDrawQuad> surface_in = SurfaceDrawQuad::Create(); |
| 408 surface_in->SetAll(shared_state3_in, | 409 surface_in->SetAll(shared_state3_in, |
| 409 arbitrary_rect2, | 410 arbitrary_rect2, |
| 410 arbitrary_rect2_inside_rect2, | 411 arbitrary_rect2_inside_rect2, |
| 411 arbitrary_rect1_inside_rect2, | 412 arbitrary_rect1_inside_rect2, |
| 412 arbitrary_bool1, | 413 arbitrary_bool1, |
| 413 arbitrary_surface_id); | 414 arbitrary_surface_id); |
| 414 scoped_ptr<DrawQuad> surface_cmp = surface_in->Copy( | 415 scoped_ptr<DrawQuad> surface_cmp = surface_in->Copy( |
| 415 surface_in->shared_quad_state); | 416 surface_in->shared_quad_state); |
| 416 | 417 |
| (...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 808 SoftwareFrameData frame_out; | 809 SoftwareFrameData frame_out; |
| 809 PickleIterator iter(msg); | 810 PickleIterator iter(msg); |
| 810 EXPECT_EQ( | 811 EXPECT_EQ( |
| 811 expect_read, | 812 expect_read, |
| 812 IPC::ParamTraits<SoftwareFrameData>::Read(&msg, &iter, &frame_out)); | 813 IPC::ParamTraits<SoftwareFrameData>::Read(&msg, &iter, &frame_out)); |
| 813 } | 814 } |
| 814 } | 815 } |
| 815 | 816 |
| 816 } // namespace | 817 } // namespace |
| 817 } // namespace content | 818 } // namespace content |
| OLD | NEW |