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

Side by Side Diff: cc/ipc/cc_param_traits_unittest.cc

Issue 2379653006: Replaced cc::SurfaceId::nonce_ with base::UnguessableToken (Closed)
Patch Set: Changed comments in surface_id.h to reflect the change Created 4 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
OLDNEW
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 <stddef.h> 5 #include <stddef.h>
6 #include <string.h> 6 #include <string.h>
7 #include <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 354
355 StreamVideoDrawQuad* streamvideo_in = 355 StreamVideoDrawQuad* streamvideo_in =
356 pass_in->CreateAndAppendDrawQuad<StreamVideoDrawQuad>(); 356 pass_in->CreateAndAppendDrawQuad<StreamVideoDrawQuad>();
357 streamvideo_in->SetAll( 357 streamvideo_in->SetAll(
358 shared_state3_in, arbitrary_rect2, arbitrary_rect2_inside_rect2, 358 shared_state3_in, arbitrary_rect2, arbitrary_rect2_inside_rect2,
359 arbitrary_rect1_inside_rect2, arbitrary_bool1, arbitrary_resourceid2, 359 arbitrary_rect1_inside_rect2, arbitrary_bool1, arbitrary_resourceid2,
360 arbitrary_size1, arbitrary_matrix1); 360 arbitrary_size1, arbitrary_matrix1);
361 pass_cmp->CopyFromAndAppendDrawQuad(streamvideo_in, 361 pass_cmp->CopyFromAndAppendDrawQuad(streamvideo_in,
362 streamvideo_in->shared_quad_state); 362 streamvideo_in->shared_quad_state);
363 363
364 cc::SurfaceId arbitrary_surface_id(kArbitraryFrameSinkId, 364 cc::SurfaceId arbitrary_surface_id(
365 cc::LocalFrameId(3, 0)); 365 kArbitraryFrameSinkId,
366 cc::LocalFrameId(3, base::UnguessableToken::Create()));
366 SurfaceDrawQuad* surface_in = 367 SurfaceDrawQuad* surface_in =
367 pass_in->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); 368 pass_in->CreateAndAppendDrawQuad<SurfaceDrawQuad>();
368 surface_in->SetAll(shared_state3_in, arbitrary_rect2, 369 surface_in->SetAll(shared_state3_in, arbitrary_rect2,
369 arbitrary_rect2_inside_rect2, arbitrary_rect1_inside_rect2, 370 arbitrary_rect2_inside_rect2, arbitrary_rect1_inside_rect2,
370 arbitrary_bool1, arbitrary_surface_id); 371 arbitrary_bool1, arbitrary_surface_id);
371 pass_cmp->CopyFromAndAppendDrawQuad(surface_in, 372 pass_cmp->CopyFromAndAppendDrawQuad(surface_in,
372 surface_in->shared_quad_state); 373 surface_in->shared_quad_state);
373 374
374 TextureDrawQuad* texture_in = 375 TextureDrawQuad* texture_in =
375 pass_in->CreateAndAppendDrawQuad<TextureDrawQuad>(); 376 pass_in->CreateAndAppendDrawQuad<TextureDrawQuad>();
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 EXPECT_TRUE( 609 EXPECT_TRUE(
609 IPC::ParamTraits<DelegatedFrameData>::Read(&msg, &iter, &frame_out)); 610 IPC::ParamTraits<DelegatedFrameData>::Read(&msg, &iter, &frame_out));
610 611
611 ASSERT_EQ(2u, frame_out.resource_list.size()); 612 ASSERT_EQ(2u, frame_out.resource_list.size());
612 Compare(arbitrary_resource1, frame_out.resource_list[0]); 613 Compare(arbitrary_resource1, frame_out.resource_list[0]);
613 Compare(arbitrary_resource2, frame_out.resource_list[1]); 614 Compare(arbitrary_resource2, frame_out.resource_list[1]);
614 } 615 }
615 616
616 } // namespace 617 } // namespace
617 } // namespace content 618 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698