| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_COMMAND_BUFFER_IMPL_H_ | 5 #ifndef COMPONENTS_MUS_GLES2_COMMAND_BUFFER_IMPL_H_ |
| 6 #define COMPONENTS_MUS_GLES2_COMMAND_BUFFER_IMPL_H_ | 6 #define COMPONENTS_MUS_GLES2_COMMAND_BUFFER_IMPL_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> |
| 11 |
| 10 #include "base/macros.h" | 12 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 13 #include "base/single_thread_task_runner.h" | 14 #include "base/single_thread_task_runner.h" |
| 14 #include "components/mus/gles2/command_buffer_driver.h" | 15 #include "components/mus/gles2/command_buffer_driver.h" |
| 15 #include "components/mus/public/interfaces/command_buffer.mojom.h" | 16 #include "components/mus/public/interfaces/command_buffer.mojom.h" |
| 16 #include "gpu/command_buffer/common/command_buffer.h" | 17 #include "gpu/command_buffer/common/command_buffer.h" |
| 17 #include "mojo/public/cpp/bindings/binding.h" | 18 #include "mojo/public/cpp/bindings/binding.h" |
| 18 | 19 |
| 19 namespace mus { | 20 namespace mus { |
| 20 | 21 |
| 21 class CommandBufferDriver; | 22 class CommandBufferDriver; |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 int32_t internal_format); | 105 int32_t internal_format); |
| 105 bool DestroyImageOnGpuThread(int32_t id); | 106 bool DestroyImageOnGpuThread(int32_t id); |
| 106 | 107 |
| 107 void BindToRequest(mojo::InterfaceRequest<CommandBuffer> request); | 108 void BindToRequest(mojo::InterfaceRequest<CommandBuffer> request); |
| 108 | 109 |
| 109 void OnConnectionError(); | 110 void OnConnectionError(); |
| 110 bool DeleteOnGpuThread(); | 111 bool DeleteOnGpuThread(); |
| 111 void DeleteOnGpuThread2(); | 112 void DeleteOnGpuThread2(); |
| 112 | 113 |
| 113 scoped_refptr<GpuState> gpu_state_; | 114 scoped_refptr<GpuState> gpu_state_; |
| 114 scoped_ptr<CommandBufferDriver> driver_; | 115 std::unique_ptr<CommandBufferDriver> driver_; |
| 115 scoped_ptr<mojo::Binding<CommandBuffer>> binding_; | 116 std::unique_ptr<mojo::Binding<CommandBuffer>> binding_; |
| 116 mojom::CommandBufferClientPtr client_; | 117 mojom::CommandBufferClientPtr client_; |
| 117 | 118 |
| 118 DISALLOW_COPY_AND_ASSIGN(CommandBufferImpl); | 119 DISALLOW_COPY_AND_ASSIGN(CommandBufferImpl); |
| 119 }; | 120 }; |
| 120 | 121 |
| 121 } // namespace mus | 122 } // namespace mus |
| 122 | 123 |
| 123 #endif // COMPONENTS_MUS_GLES2_COMMAND_BUFFER_IMPL_H_ | 124 #endif // COMPONENTS_MUS_GLES2_COMMAND_BUFFER_IMPL_H_ |
| OLD | NEW |