| 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_PIXEL_TEST_DELEGATING_OUTPUT_SURFACE_H_ | 5 #ifndef CC_TEST_PIXEL_TEST_DELEGATING_OUTPUT_SURFACE_H_ |
| 6 #define CC_TEST_PIXEL_TEST_DELEGATING_OUTPUT_SURFACE_H_ | 6 #define CC_TEST_PIXEL_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/scheduler/begin_frame_source.h" | 10 #include "cc/scheduler/begin_frame_source.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 void DisplaySetMemoryPolicy(const ManagedMemoryPolicy& policy) override {} | 52 void DisplaySetMemoryPolicy(const ManagedMemoryPolicy& policy) override {} |
| 53 }; | 53 }; |
| 54 | 54 |
| 55 SharedBitmapManager* const shared_bitmap_manager_; | 55 SharedBitmapManager* const shared_bitmap_manager_; |
| 56 gpu::GpuMemoryBufferManager* const gpu_memory_buffer_manager_; | 56 gpu::GpuMemoryBufferManager* const gpu_memory_buffer_manager_; |
| 57 const bool allow_force_reclaim_resources_; | 57 const bool allow_force_reclaim_resources_; |
| 58 const bool synchronous_composite_; | 58 const bool synchronous_composite_; |
| 59 | 59 |
| 60 gfx::Size enlarge_pass_texture_amount_; | 60 gfx::Size enlarge_pass_texture_amount_; |
| 61 | 61 |
| 62 std::unique_ptr<BackToBackBeginFrameSource> begin_frame_source_; | |
| 63 | |
| 64 // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface | 62 // TODO(danakj): These don't to be stored in unique_ptrs when OutputSurface |
| 65 // is owned/destroyed on the compositor thread. | 63 // is owned/destroyed on the compositor thread. |
| 66 std::unique_ptr<SurfaceManager> surface_manager_; | 64 std::unique_ptr<SurfaceManager> surface_manager_; |
| 67 std::unique_ptr<SurfaceIdAllocator> surface_id_allocator_; | 65 std::unique_ptr<SurfaceIdAllocator> surface_id_allocator_; |
| 68 SurfaceId delegated_surface_id_; | 66 SurfaceId delegated_surface_id_; |
| 69 | 67 |
| 70 // Uses surface_manager_. | 68 // Uses surface_manager_. |
| 71 std::unique_ptr<SurfaceFactory> surface_factory_; | 69 std::unique_ptr<SurfaceFactory> surface_factory_; |
| 72 | 70 |
| 73 PixelTestDisplayClient display_client_; | 71 PixelTestDisplayClient display_client_; |
| 74 // Uses surface_manager_. | 72 // Uses surface_manager_. |
| 75 std::unique_ptr<Display> display_; | 73 std::unique_ptr<Display> display_; |
| 76 | 74 |
| 77 base::WeakPtrFactory<PixelTestDelegatingOutputSurface> weak_ptrs_; | 75 base::WeakPtrFactory<PixelTestDelegatingOutputSurface> weak_ptrs_; |
| 78 }; | 76 }; |
| 79 | 77 |
| 80 } // namespace cc | 78 } // namespace cc |
| 81 | 79 |
| 82 #endif // CC_TEST_PIXEL_TEST_DELEGATING_OUTPUT_SURFACE_H_ | 80 #endif // CC_TEST_PIXEL_TEST_DELEGATING_OUTPUT_SURFACE_H_ |
| OLD | NEW |