| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ | 5 #ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ |
| 6 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ | 6 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "cc/ipc/display_compositor.mojom.h" | 11 #include "cc/ipc/display_compositor.mojom.h" |
| 12 #include "cc/surfaces/frame_sink_id.h" | 12 #include "cc/surfaces/frame_sink_id.h" |
| 13 #include "cc/surfaces/local_frame_id.h" | 13 #include "cc/surfaces/local_frame_id.h" |
| 14 #include "cc/surfaces/surface_id.h" | 14 #include "cc/surfaces/surface_id.h" |
| 15 #include "cc/surfaces/surface_manager.h" | 15 #include "cc/surfaces/surface_manager.h" |
| 16 #include "cc/surfaces/surface_observer.h" | 16 #include "cc/surfaces/surface_observer.h" |
| 17 #include "gpu/ipc/common/surface_handle.h" | 17 #include "gpu/ipc/common/surface_handle.h" |
| 18 #include "gpu/ipc/in_process_command_buffer.h" | 18 #include "gpu/ipc/in_process_command_buffer.h" |
| 19 #include "ipc/ipc_channel_handle.h" | 19 #include "ipc/ipc_channel_handle.h" |
| 20 #include "mojo/public/cpp/bindings/binding.h" | 20 #include "mojo/public/cpp/bindings/binding.h" |
| 21 #include "services/ui/surfaces/mus_gpu_memory_buffer_manager.h" | 21 #include "services/ui/common/mus_gpu_memory_buffer_manager.h" |
| 22 | 22 |
| 23 namespace gpu { | 23 namespace gpu { |
| 24 class ImageFactory; | 24 class ImageFactory; |
| 25 } | 25 } |
| 26 | 26 |
| 27 namespace cc { | 27 namespace cc { |
| 28 class SurfaceHittest; | 28 class SurfaceHittest; |
| 29 class SurfaceManager; | 29 class SurfaceManager; |
| 30 } // namespace cc | 30 } // namespace cc |
| 31 | 31 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 temp_references_; | 110 temp_references_; |
| 111 | 111 |
| 112 mojo::Binding<cc::mojom::DisplayCompositor> binding_; | 112 mojo::Binding<cc::mojom::DisplayCompositor> binding_; |
| 113 | 113 |
| 114 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor); | 114 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor); |
| 115 }; | 115 }; |
| 116 | 116 |
| 117 } // namespace ui | 117 } // namespace ui |
| 118 | 118 |
| 119 #endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ | 119 #endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ |
| OLD | NEW |