| 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_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ | 5 #ifndef CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ |
| 6 #define CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ | 6 #define CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <queue> | 9 #include <queue> |
| 10 #include <string> | 10 #include <string> |
| 11 | 11 |
| 12 #include "gpu/ipc/command_buffer_proxy.h" | 12 #include "gpu/ipc/command_buffer_proxy.h" |
| 13 | 13 |
| 14 #include "base/callback.h" | 14 #include "base/callback.h" |
| 15 #include "base/compiler_specific.h" | 15 #include "base/compiler_specific.h" |
| 16 #include "base/hash_tables.h" | 16 #include "base/hash_tables.h" |
| 17 #include "base/memory/ref_counted.h" | 17 #include "base/memory/ref_counted.h" |
| 18 #include "base/memory/weak_ptr.h" | 18 #include "base/memory/weak_ptr.h" |
| 19 #include "base/observer_list.h" | 19 #include "base/observer_list.h" |
| 20 #include "cc/debug/latency_info.h" | |
| 21 #include "content/common/gpu/gpu_memory_allocation.h" | 20 #include "content/common/gpu/gpu_memory_allocation.h" |
| 22 #include "content/common/gpu/gpu_memory_allocation.h" | 21 #include "content/common/gpu/gpu_memory_allocation.h" |
| 23 #include "gpu/command_buffer/common/command_buffer.h" | 22 #include "gpu/command_buffer/common/command_buffer.h" |
| 24 #include "gpu/command_buffer/common/command_buffer_shared.h" | 23 #include "gpu/command_buffer/common/command_buffer_shared.h" |
| 25 #include "ipc/ipc_listener.h" | 24 #include "ipc/ipc_listener.h" |
| 26 #include "media/video/video_decode_accelerator.h" | 25 #include "media/video/video_decode_accelerator.h" |
| 26 #include "ui/base/latency_info.h" |
| 27 | 27 |
| 28 struct GPUCommandBufferConsoleMessage; | 28 struct GPUCommandBufferConsoleMessage; |
| 29 | 29 |
| 30 namespace base { | 30 namespace base { |
| 31 class SharedMemory; | 31 class SharedMemory; |
| 32 } | 32 } |
| 33 | 33 |
| 34 namespace gpu { | 34 namespace gpu { |
| 35 struct Mailbox; | 35 struct Mailbox; |
| 36 } | 36 } |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 // handled only on the GPU process' IO thread, and so is not effectively | 120 // handled only on the GPU process' IO thread, and so is not effectively |
| 121 // a finish. | 121 // a finish. |
| 122 bool GenerateMailboxNames(unsigned num, std::vector<gpu::Mailbox>* names); | 122 bool GenerateMailboxNames(unsigned num, std::vector<gpu::Mailbox>* names); |
| 123 | 123 |
| 124 // Sends an IPC message with the new state of surface visibility. | 124 // Sends an IPC message with the new state of surface visibility. |
| 125 bool SetSurfaceVisible(bool visible); | 125 bool SetSurfaceVisible(bool visible); |
| 126 | 126 |
| 127 void SetOnConsoleMessageCallback( | 127 void SetOnConsoleMessageCallback( |
| 128 const GpuConsoleMessageCallback& callback); | 128 const GpuConsoleMessageCallback& callback); |
| 129 | 129 |
| 130 void SetLatencyInfo(const cc::LatencyInfo& latency_info); | 130 void SetLatencyInfo(const ui::LatencyInfo& latency_info); |
| 131 | 131 |
| 132 // TODO(apatrick): this is a temporary optimization while skia is calling | 132 // TODO(apatrick): this is a temporary optimization while skia is calling |
| 133 // ContentGLContext::MakeCurrent prior to every GL call. It saves returning 6 | 133 // ContentGLContext::MakeCurrent prior to every GL call. It saves returning 6 |
| 134 // ints redundantly when only the error is needed for the | 134 // ints redundantly when only the error is needed for the |
| 135 // CommandBufferProxyImpl implementation. | 135 // CommandBufferProxyImpl implementation. |
| 136 virtual gpu::error::Error GetLastError() OVERRIDE; | 136 virtual gpu::error::Error GetLastError() OVERRIDE; |
| 137 | 137 |
| 138 void SendManagedMemoryStats(const GpuManagedMemoryStats& stats); | 138 void SendManagedMemoryStats(const GpuManagedMemoryStats& stats); |
| 139 | 139 |
| 140 GpuChannelHost* channel() const { return channel_; } | 140 GpuChannelHost* channel() const { return channel_; } |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 // Tasks to be invoked in SignalSyncPoint responses. | 198 // Tasks to be invoked in SignalSyncPoint responses. |
| 199 uint32 next_signal_id_; | 199 uint32 next_signal_id_; |
| 200 SignalTaskMap signal_tasks_; | 200 SignalTaskMap signal_tasks_; |
| 201 | 201 |
| 202 DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl); | 202 DISALLOW_COPY_AND_ASSIGN(CommandBufferProxyImpl); |
| 203 }; | 203 }; |
| 204 | 204 |
| 205 } // namespace content | 205 } // namespace content |
| 206 | 206 |
| 207 #endif // CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ | 207 #endif // CONTENT_COMMON_GPU_CLIENT_COMMAND_BUFFER_PROXY_IMPL_H_ |
| OLD | NEW |