| 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 COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_ | 5 #ifndef COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_ |
| 6 #define COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_ | 6 #define COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_ |
| 7 | 7 |
| 8 #include "cc/surfaces/display_client.h" | 8 #include "cc/surfaces/display_client.h" |
| 9 #include "cc/surfaces/surface.h" | 9 #include "cc/surfaces/surface.h" |
| 10 #include "cc/surfaces/surface_factory.h" | 10 #include "cc/surfaces/surface_factory.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 void DisplayOutputSurfaceLost() override; | 64 void DisplayOutputSurfaceLost() override; |
| 65 void DisplaySetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override; | 65 void DisplaySetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override; |
| 66 | 66 |
| 67 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 67 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
| 68 scoped_refptr<SurfacesState> surfaces_state_; | 68 scoped_refptr<SurfacesState> surfaces_state_; |
| 69 cc::SurfaceFactory factory_; | 69 cc::SurfaceFactory factory_; |
| 70 cc::SurfaceIdAllocator allocator_; | 70 cc::SurfaceIdAllocator allocator_; |
| 71 cc::SurfaceId surface_id_; | 71 cc::SurfaceId surface_id_; |
| 72 | 72 |
| 73 gfx::Size display_size_; | 73 gfx::Size display_size_; |
| 74 |
| 74 std::unique_ptr<cc::Display> display_; | 75 std::unique_ptr<cc::Display> display_; |
| 76 |
| 75 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor); | 77 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor); |
| 76 }; | 78 }; |
| 77 | 79 |
| 78 } // namespace mus | 80 } // namespace mus |
| 79 | 81 |
| 80 #endif // COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_ | 82 #endif // COMPONENTS_MUS_SURFACES_DISPLAY_COMPOSITOR_H_ |
| OLD | NEW |