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

Side by Side Diff: cc/surfaces/surface_unittest.cc

Issue 2485473003: Remove SurfaceFactory::Create and SurfaceFactory::Destroy (Closed)
Patch Set: SetPreviousFrame lint Created 4 years, 1 month 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/surfaces/surface.h" 5 #include "cc/surfaces/surface.h"
6 #include "cc/surfaces/surface_factory.h" 6 #include "cc/surfaces/surface_factory.h"
7 #include "cc/surfaces/surface_factory_client.h" 7 #include "cc/surfaces/surface_factory_client.h"
8 #include "cc/surfaces/surface_id_allocator.h" 8 #include "cc/surfaces/surface_id_allocator.h"
9 #include "cc/surfaces/surface_manager.h" 9 #include "cc/surfaces/surface_manager.h"
10 #include "cc/test/scheduler_test_common.h" 10 #include "cc/test/scheduler_test_common.h"
(...skipping 23 matching lines...) Expand all
34 34
35 TEST(SurfaceTest, SurfaceLifetime) { 35 TEST(SurfaceTest, SurfaceLifetime) {
36 SurfaceManager manager; 36 SurfaceManager manager;
37 FakeSurfaceFactoryClient surface_factory_client; 37 FakeSurfaceFactoryClient surface_factory_client;
38 SurfaceFactory factory(kArbitraryFrameSinkId, &manager, 38 SurfaceFactory factory(kArbitraryFrameSinkId, &manager,
39 &surface_factory_client); 39 &surface_factory_client);
40 40
41 LocalFrameId local_frame_id(6, base::UnguessableToken::Create()); 41 LocalFrameId local_frame_id(6, base::UnguessableToken::Create());
42 SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id); 42 SurfaceId surface_id(kArbitraryFrameSinkId, local_frame_id);
43 { 43 {
44 factory.Create(local_frame_id); 44 factory.SubmitCompositorFrame(local_frame_id, CompositorFrame(),
45 SurfaceFactory::DrawCallback());
45 EXPECT_TRUE(manager.GetSurfaceForId(surface_id)); 46 EXPECT_TRUE(manager.GetSurfaceForId(surface_id));
46 factory.Destroy(local_frame_id); 47 factory.SubmitCompositorFrame(
48 LocalFrameId(9, base::UnguessableToken::Create()), CompositorFrame(),
49 SurfaceFactory::DrawCallback());
47 } 50 }
48 51
49 EXPECT_EQ(NULL, manager.GetSurfaceForId(surface_id)); 52 EXPECT_EQ(NULL, manager.GetSurfaceForId(surface_id));
50 } 53 }
51 54
52 TEST(SurfaceTest, SurfaceIds) { 55 TEST(SurfaceTest, SurfaceIds) {
53 for (size_t i = 0; i < 3; ++i) { 56 for (size_t i = 0; i < 3; ++i) {
54 SurfaceIdAllocator allocator; 57 SurfaceIdAllocator allocator;
55 LocalFrameId id1 = allocator.GenerateId(); 58 LocalFrameId id1 = allocator.GenerateId();
56 LocalFrameId id2 = allocator.GenerateId(); 59 LocalFrameId id2 = allocator.GenerateId();
57 EXPECT_NE(id1, id2); 60 EXPECT_NE(id1, id2);
58 } 61 }
59 } 62 }
60 63
61 } // namespace 64 } // namespace
62 } // namespace cc 65 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698