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

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

Issue 2304483002: Revert of Make cc::Display not own its BeginFrameSource (Closed)
Patch Set: Created 4 years, 3 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 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_DELEGATING_OUTPUT_SURFACE_H_ 5 #ifndef CC_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_
6 #define CC_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_ 6 #define CC_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "cc/output/output_surface.h" 9 #include "cc/output/output_surface.h"
10 #include "cc/output/renderer_settings.h" 10 #include "cc/output/renderer_settings.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 void DidDrawCallback(bool synchronous); 83 void DidDrawCallback(bool synchronous);
84 84
85 // TODO(danakj): These don't need to be stored in unique_ptrs when 85 // TODO(danakj): These don't need to be stored in unique_ptrs when
86 // OutputSurface is owned/destroyed on the compositor thread. 86 // OutputSurface is owned/destroyed on the compositor thread.
87 std::unique_ptr<SurfaceManager> surface_manager_; 87 std::unique_ptr<SurfaceManager> surface_manager_;
88 std::unique_ptr<SurfaceIdAllocator> surface_id_allocator_; 88 std::unique_ptr<SurfaceIdAllocator> surface_id_allocator_;
89 SurfaceId delegated_surface_id_; 89 SurfaceId delegated_surface_id_;
90 90
91 // Uses surface_manager_. 91 // Uses surface_manager_.
92 std::unique_ptr<SurfaceFactory> surface_factory_; 92 std::unique_ptr<SurfaceFactory> surface_factory_;
93 std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source_; 93
94 // Uses surface_manager_.
94 std::unique_ptr<Display> display_; 95 std::unique_ptr<Display> display_;
95 96
96 bool bound_ = false; 97 bool bound_ = false;
97 TestDelegatingOutputSurfaceClient* test_client_ = nullptr; 98 TestDelegatingOutputSurfaceClient* test_client_ = nullptr;
98 gfx::Size enlarge_pass_texture_amount_; 99 gfx::Size enlarge_pass_texture_amount_;
99 100
100 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_; 101 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_;
101 102
102 base::WeakPtrFactory<TestDelegatingOutputSurface> weak_ptrs_; 103 base::WeakPtrFactory<TestDelegatingOutputSurface> weak_ptrs_;
103 }; 104 };
104 105
105 } // namespace cc 106 } // namespace cc
106 107
107 #endif // CC_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_ 108 #endif // CC_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_
OLDNEW
« no previous file with comments | « cc/surfaces/surface_display_output_surface_unittest.cc ('k') | cc/test/test_delegating_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698