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

Side by Side Diff: cc/test/test_compositor_frame_sink.h

Issue 2565783002: Moves ownership of the cc::Display's BeginFrameSource out of Display. (Closed)
Patch Set: rebase. Created 4 years 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
« no previous file with comments | « cc/surfaces/display_unittest.cc ('k') | cc/test/test_compositor_frame_sink.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_ 5 #ifndef CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_
6 #define CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_ 6 #define CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "cc/output/compositor_frame_sink.h" 10 #include "cc/output/compositor_frame_sink.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 FrameSinkId frame_sink_id_; 98 FrameSinkId frame_sink_id_;
99 // TODO(danakj): These don't need to be stored in unique_ptrs when 99 // TODO(danakj): These don't need to be stored in unique_ptrs when
100 // CompositorFrameSink is owned/destroyed on the compositor thread. 100 // CompositorFrameSink is owned/destroyed on the compositor thread.
101 std::unique_ptr<SurfaceManager> surface_manager_; 101 std::unique_ptr<SurfaceManager> surface_manager_;
102 std::unique_ptr<SurfaceIdAllocator> surface_id_allocator_; 102 std::unique_ptr<SurfaceIdAllocator> surface_id_allocator_;
103 LocalFrameId delegated_local_frame_id_; 103 LocalFrameId delegated_local_frame_id_;
104 104
105 // Uses surface_manager_. 105 // Uses surface_manager_.
106 std::unique_ptr<SurfaceFactory> surface_factory_; 106 std::unique_ptr<SurfaceFactory> surface_factory_;
107 107
108 // Uses surface_manager_. 108 std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source_;
109
110 // Uses surface_manager_ and begin_frame_source_.
109 std::unique_ptr<Display> display_; 111 std::unique_ptr<Display> display_;
110 112
111 bool bound_ = false; 113 bool bound_ = false;
112 TestCompositorFrameSinkClient* test_client_ = nullptr; 114 TestCompositorFrameSinkClient* test_client_ = nullptr;
113 gfx::Size enlarge_pass_texture_amount_; 115 gfx::Size enlarge_pass_texture_amount_;
114 116
115 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_; 117 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_;
116 118
117 base::WeakPtrFactory<TestCompositorFrameSink> weak_ptr_factory_; 119 base::WeakPtrFactory<TestCompositorFrameSink> weak_ptr_factory_;
118 }; 120 };
119 121
120 } // namespace cc 122 } // namespace cc
121 123
122 #endif // CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_ 124 #endif // CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_
OLDNEW
« no previous file with comments | « cc/surfaces/display_unittest.cc ('k') | cc/test/test_compositor_frame_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698