| 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_GPU_CHANNEL_HOST_H_ | 5 #ifndef CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_ |
| 6 #define CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_ | 6 #define CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 #include "content/public/common/gpu_info.h" | 21 #include "content/public/common/gpu_info.h" |
| 22 #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h" | 22 #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h" |
| 23 #include "ipc/ipc_channel_handle.h" | 23 #include "ipc/ipc_channel_handle.h" |
| 24 #include "ipc/ipc_channel_proxy.h" | 24 #include "ipc/ipc_channel_proxy.h" |
| 25 #include "ipc/ipc_sync_channel.h" | 25 #include "ipc/ipc_sync_channel.h" |
| 26 #include "ui/gfx/gl/gpu_preference.h" | 26 #include "ui/gfx/gl/gpu_preference.h" |
| 27 #include "ui/gfx/native_widget_types.h" | 27 #include "ui/gfx/native_widget_types.h" |
| 28 #include "ui/gfx/size.h" | 28 #include "ui/gfx/size.h" |
| 29 | 29 |
| 30 class CommandBufferProxy; | 30 class CommandBufferProxy; |
| 31 class CommandBufferProxyImpl; |
| 31 struct GPUCreateCommandBufferConfig; | 32 struct GPUCreateCommandBufferConfig; |
| 32 class GURL; | 33 class GURL; |
| 33 class TransportTextureService; | 34 class TransportTextureService; |
| 34 class MessageLoop; | 35 class MessageLoop; |
| 35 | 36 |
| 36 namespace base { | 37 namespace base { |
| 37 class MessageLoopProxy; | 38 class MessageLoopProxy; |
| 38 } | 39 } |
| 39 | 40 |
| 40 namespace IPC { | 41 namespace IPC { |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 int client_id_; | 184 int client_id_; |
| 184 | 185 |
| 185 State state_; | 186 State state_; |
| 186 | 187 |
| 187 content::GPUInfo gpu_info_; | 188 content::GPUInfo gpu_info_; |
| 188 | 189 |
| 189 scoped_ptr<IPC::SyncChannel> channel_; | 190 scoped_ptr<IPC::SyncChannel> channel_; |
| 190 scoped_refptr<MessageFilter> channel_filter_; | 191 scoped_refptr<MessageFilter> channel_filter_; |
| 191 | 192 |
| 192 // Used to look up a proxy from its routing id. | 193 // Used to look up a proxy from its routing id. |
| 193 typedef base::hash_map<int, CommandBufferProxy*> ProxyMap; | 194 typedef base::hash_map<int, CommandBufferProxyImpl*> ProxyMap; |
| 194 ProxyMap proxies_; | 195 ProxyMap proxies_; |
| 195 | 196 |
| 196 // A lock to guard against concurrent access to members like the proxies map | 197 // A lock to guard against concurrent access to members like the proxies map |
| 197 // for calls from contexts that may live on the compositor or main thread. | 198 // for calls from contexts that may live on the compositor or main thread. |
| 198 mutable base::Lock context_lock_; | 199 mutable base::Lock context_lock_; |
| 199 | 200 |
| 200 // A filter for sending messages from thread other than the main thread. | 201 // A filter for sending messages from thread other than the main thread. |
| 201 scoped_refptr<IPC::SyncMessageFilter> sync_filter_; | 202 scoped_refptr<IPC::SyncMessageFilter> sync_filter_; |
| 202 | 203 |
| 203 DISALLOW_COPY_AND_ASSIGN(GpuChannelHost); | 204 DISALLOW_COPY_AND_ASSIGN(GpuChannelHost); |
| 204 }; | 205 }; |
| 205 | 206 |
| 206 #endif // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_ | 207 #endif // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_ |
| OLD | NEW |