| 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_GLES2_OZONE_GPU_MEMORY_BUFFER_ | 5 #ifndef COMPONENTS_MUS_GLES2_OZONE_GPU_MEMORY_BUFFER_ |
| 6 #define COMPONENTS_MUS_GLES2_OZONE_GPU_MEMORY_BUFFER_ | 6 #define COMPONENTS_MUS_GLES2_OZONE_GPU_MEMORY_BUFFER_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "components/mus/gles2/gpu_memory_buffer_impl.h" | 10 #include "components/mus/common/gpu_memory_buffer_impl.h" |
| 11 #include "ui/gfx/geometry/size.h" | 11 #include "ui/gfx/geometry/size.h" |
| 12 #include "ui/gfx/gpu_memory_buffer.h" | 12 #include "ui/gfx/gpu_memory_buffer.h" |
| 13 #include "ui/gfx/native_widget_types.h" | 13 #include "ui/gfx/native_widget_types.h" |
| 14 | 14 |
| 15 namespace ui { | 15 namespace ui { |
| 16 class ClientNativePixmap; | 16 class ClientNativePixmap; |
| 17 class NativePixmap; | 17 class NativePixmap; |
| 18 } // namespace ui | 18 } // namespace ui |
| 19 | 19 |
| 20 namespace mus { | 20 namespace mus { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 // From content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h | 62 // From content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h |
| 63 std::unique_ptr<ui::ClientNativePixmap> client_pixmap_; | 63 std::unique_ptr<ui::ClientNativePixmap> client_pixmap_; |
| 64 scoped_refptr<ui::NativePixmap> native_pixmap_; | 64 scoped_refptr<ui::NativePixmap> native_pixmap_; |
| 65 | 65 |
| 66 DISALLOW_COPY_AND_ASSIGN(OzoneGpuMemoryBuffer); | 66 DISALLOW_COPY_AND_ASSIGN(OzoneGpuMemoryBuffer); |
| 67 }; | 67 }; |
| 68 | 68 |
| 69 } // namespace mus | 69 } // namespace mus |
| 70 | 70 |
| 71 #endif // COMPONENTS_MUS_GLES2_OZONE_GPU_MEMORY_BUFFER_ | 71 #endif // COMPONENTS_MUS_GLES2_OZONE_GPU_MEMORY_BUFFER_ |
| OLD | NEW |