| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 CONTENT_GPU_GPU_CHILD_THREAD_H_ | 5 #ifndef CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ | 6 #define CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 void OnSetVideoMemoryWindowCount(uint32_t window_count); | 115 void OnSetVideoMemoryWindowCount(uint32_t window_count); |
| 116 | 116 |
| 117 void OnClean(); | 117 void OnClean(); |
| 118 void OnCrash(); | 118 void OnCrash(); |
| 119 void OnHang(); | 119 void OnHang(); |
| 120 #if defined(OS_ANDROID) | 120 #if defined(OS_ANDROID) |
| 121 void OnJavaCrash(); | 121 void OnJavaCrash(); |
| 122 #endif | 122 #endif |
| 123 void OnGpuSwitched(); | 123 void OnGpuSwitched(); |
| 124 | 124 |
| 125 void OnCloseChannel(int32_t client_id); | |
| 126 void OnLoadedShader(const std::string& shader); | |
| 127 void OnDestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, | 125 void OnDestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, |
| 128 int client_id, | 126 int client_id, |
| 129 const gpu::SyncToken& sync_token); | 127 const gpu::SyncToken& sync_token); |
| 130 #if defined(OS_ANDROID) | |
| 131 void OnWakeUpGpu(); | |
| 132 void OnDestroyingVideoSurface(int surface_id); | |
| 133 #endif | |
| 134 | |
| 135 void BindServiceFactoryRequest( | 128 void BindServiceFactoryRequest( |
| 136 service_manager::mojom::ServiceFactoryRequest request); | 129 service_manager::mojom::ServiceFactoryRequest request); |
| 137 | 130 |
| 138 gpu::GpuChannelManager* gpu_channel_manager() { | 131 gpu::GpuChannelManager* gpu_channel_manager() { |
| 139 return gpu_service_->gpu_channel_manager(); | 132 return gpu_service_->gpu_channel_manager(); |
| 140 } | 133 } |
| 141 | 134 |
| 142 // Set this flag to true if a fatal error occurred before we receive the | 135 // Set this flag to true if a fatal error occurred before we receive the |
| 143 // OnInitialize message, in which case we just declare ourselves DOA. | 136 // OnInitialize message, in which case we just declare ourselves DOA. |
| 144 const bool dead_on_arrival_; | 137 const bool dead_on_arrival_; |
| (...skipping 23 matching lines...) Expand all Loading... |
| 168 AssociatedInterfaceRegistryImpl associated_interfaces_; | 161 AssociatedInterfaceRegistryImpl associated_interfaces_; |
| 169 std::unique_ptr<ui::GpuService> gpu_service_; | 162 std::unique_ptr<ui::GpuService> gpu_service_; |
| 170 mojo::AssociatedBinding<ui::mojom::GpuMain> gpu_main_binding_; | 163 mojo::AssociatedBinding<ui::mojom::GpuMain> gpu_main_binding_; |
| 171 | 164 |
| 172 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); | 165 DISALLOW_COPY_AND_ASSIGN(GpuChildThread); |
| 173 }; | 166 }; |
| 174 | 167 |
| 175 } // namespace content | 168 } // namespace content |
| 176 | 169 |
| 177 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ | 170 #endif // CONTENT_GPU_GPU_CHILD_THREAD_H_ |
| OLD | NEW |