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_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/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "cc/output/compositor_frame_sink.h" | 9 #include "cc/output/compositor_frame_sink.h" |
| 10 #include "cc/output/renderer_settings.h" | 10 #include "cc/output/renderer_settings.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 // Uses surface_manager_. | 90 // Uses surface_manager_. |
| 91 std::unique_ptr<SurfaceFactory> surface_factory_; | 91 std::unique_ptr<SurfaceFactory> surface_factory_; |
| 92 | 92 |
| 93 // Uses surface_manager_. | 93 // Uses surface_manager_. |
| 94 std::unique_ptr<Display> display_; | 94 std::unique_ptr<Display> display_; |
| 95 | 95 |
| 96 bool bound_ = false; | 96 bool bound_ = false; |
| 97 TestCompositorFrameSinkClient* test_client_ = nullptr; | 97 TestCompositorFrameSinkClient* test_client_ = nullptr; |
| 98 gfx::Size enlarge_pass_texture_amount_; | 98 gfx::Size enlarge_pass_texture_amount_; |
| 99 | 99 |
| 100 bool display_context_shared_with_compositor_ = false; | |
|
danakj
2016/10/06 20:50:35
nit: group with other bool bound_? maybe above it
sunnyps
2016/10/06 21:31:53
Done.
| |
| 101 | |
| 100 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_; | 102 std::vector<std::unique_ptr<CopyOutputRequest>> copy_requests_; |
| 101 | 103 |
| 102 base::WeakPtrFactory<TestCompositorFrameSink> weak_ptrs_; | 104 base::WeakPtrFactory<TestCompositorFrameSink> weak_ptrs_; |
| 103 }; | 105 }; |
| 104 | 106 |
| 105 } // namespace cc | 107 } // namespace cc |
| 106 | 108 |
| 107 #endif // CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_ | 109 #endif // CC_TEST_TEST_COMPOSITOR_FRAME_SINK_H_ |
| OLD | NEW |