Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 81 | 81 |
| 82 private: | 82 private: |
| 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 std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source_; | |
|
danakj
2016/08/30 01:10:56
Can you put this right on top of display_ since th
| |
| 92 | |
| 91 // Uses surface_manager_. | 93 // Uses surface_manager_. |
| 92 std::unique_ptr<SurfaceFactory> surface_factory_; | 94 std::unique_ptr<SurfaceFactory> surface_factory_; |
| 93 | 95 |
| 94 // Uses surface_manager_. | 96 // Uses surface_manager_. |
| 95 std::unique_ptr<Display> display_; | 97 std::unique_ptr<Display> display_; |
| 96 | 98 |
| 97 bool bound_ = false; | 99 bool bound_ = false; |
| 98 TestDelegatingOutputSurfaceClient* test_client_ = nullptr; | 100 TestDelegatingOutputSurfaceClient* test_client_ = nullptr; |
| 99 gfx::Size enlarge_pass_texture_amount_; | 101 gfx::Size enlarge_pass_texture_amount_; |
| 100 | 102 |
| 101 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_; | 103 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_; |
| 102 | 104 |
| 103 base::WeakPtrFactory<TestDelegatingOutputSurface> weak_ptrs_; | 105 base::WeakPtrFactory<TestDelegatingOutputSurface> weak_ptrs_; |
| 104 }; | 106 }; |
| 105 | 107 |
| 106 } // namespace cc | 108 } // namespace cc |
| 107 | 109 |
| 108 #endif // CC_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_ | 110 #endif // CC_TEST_TEST_DELEGATING_OUTPUT_SURFACE_H_ |
| OLD | NEW |