| 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 COMPONENTS_EXO_DISPLAY_H_ | 5 #ifndef COMPONENTS_EXO_DISPLAY_H_ |
| 6 #define COMPONENTS_EXO_DISPLAY_H_ | 6 #define COMPONENTS_EXO_DISPLAY_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <string> | 11 #include <string> |
| 12 | 12 |
| 13 #include "base/macros.h" | 13 #include "base/macros.h" |
| 14 #include "base/memory/shared_memory_handle.h" | 14 #include "base/memory/shared_memory_handle.h" |
| 15 | 15 |
| 16 #if defined(OS_LINUX) |
| 17 #include "base/files/scoped_file.h" |
| 18 #endif |
| 19 |
| 16 #if defined(USE_OZONE) | 20 #if defined(USE_OZONE) |
| 17 #include "base/files/scoped_file.h" | |
| 18 #include "ui/gfx/buffer_types.h" | 21 #include "ui/gfx/buffer_types.h" |
| 19 #include "ui/gfx/geometry/size.h" | 22 #include "ui/gfx/geometry/size.h" |
| 20 #include "ui/gfx/native_pixmap_handle.h" | 23 #include "ui/gfx/native_pixmap_handle.h" |
| 21 #endif | 24 #endif |
| 22 | 25 |
| 23 namespace gfx { | 26 namespace gfx { |
| 24 class GpuFence; | 27 class GpuFence; |
| 25 class Point; | 28 class Point; |
| 26 } | 29 } |
| 27 | 30 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 55 const base::SharedMemoryHandle& handle, | 58 const base::SharedMemoryHandle& handle, |
| 56 size_t size); | 59 size_t size); |
| 57 | 60 |
| 58 #if defined(USE_OZONE) | 61 #if defined(USE_OZONE) |
| 59 // Creates a buffer for a Linux DMA-buf file descriptor. | 62 // Creates a buffer for a Linux DMA-buf file descriptor. |
| 60 std::unique_ptr<Buffer> CreateLinuxDMABufBuffer( | 63 std::unique_ptr<Buffer> CreateLinuxDMABufBuffer( |
| 61 const gfx::Size& size, | 64 const gfx::Size& size, |
| 62 gfx::BufferFormat format, | 65 gfx::BufferFormat format, |
| 63 const std::vector<gfx::NativePixmapPlane>& planes, | 66 const std::vector<gfx::NativePixmapPlane>& planes, |
| 64 std::vector<base::ScopedFD>&& fds); | 67 std::vector<base::ScopedFD>&& fds); |
| 68 #endif // defined(USE_OZONE) |
| 65 | 69 |
| 70 #if defined(OS_LINUX) |
| 66 // Creates a GpuFence for a Linux fence file descriptor. | 71 // Creates a GpuFence for a Linux fence file descriptor. |
| 67 std::unique_ptr<gfx::GpuFence> CreateLinuxFence(base::ScopedFD fd); | 72 std::unique_ptr<gfx::GpuFence> CreateLinuxFence(base::ScopedFD fd); |
| 68 #endif | 73 #endif // defined(OS_LINUX) |
| 69 | 74 |
| 70 // Creates a shell surface for an existing surface. | 75 // Creates a shell surface for an existing surface. |
| 71 std::unique_ptr<ShellSurface> CreateShellSurface(Surface* surface); | 76 std::unique_ptr<ShellSurface> CreateShellSurface(Surface* surface); |
| 72 | 77 |
| 73 // Creates a popup shell surface for an existing surface at |position| and | 78 // Creates a popup shell surface for an existing surface at |position| and |
| 74 // with |parent|. |position| is in |parent| surface local coordinates. | 79 // with |parent|. |position| is in |parent| surface local coordinates. |
| 75 std::unique_ptr<ShellSurface> CreatePopupShellSurface( | 80 std::unique_ptr<ShellSurface> CreatePopupShellSurface( |
| 76 Surface* surface, | 81 Surface* surface, |
| 77 ShellSurface* parent, | 82 ShellSurface* parent, |
| 78 const gfx::Point& position); | 83 const gfx::Point& position); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 93 | 98 |
| 94 private: | 99 private: |
| 95 NotificationSurfaceManager* const notification_surface_manager_; | 100 NotificationSurfaceManager* const notification_surface_manager_; |
| 96 | 101 |
| 97 DISALLOW_COPY_AND_ASSIGN(Display); | 102 DISALLOW_COPY_AND_ASSIGN(Display); |
| 98 }; | 103 }; |
| 99 | 104 |
| 100 } // namespace exo | 105 } // namespace exo |
| 101 | 106 |
| 102 #endif // COMPONENTS_EXO_DISPLAY_H_ | 107 #endif // COMPONENTS_EXO_DISPLAY_H_ |
| OLD | NEW |