| Index: content/common/gpu/gpu_messages.h
|
| ===================================================================
|
| --- content/common/gpu/gpu_messages.h (revision 201645)
|
| +++ content/common/gpu/gpu_messages.h (working copy)
|
| @@ -16,10 +16,10 @@
|
| #include "content/common/gpu/gpu_process_launch_causes.h"
|
| #include "content/common/gpu/gpu_rendering_stats.h"
|
| #include "content/public/common/common_param_traits.h"
|
| -#include "content/public/common/gpu_info.h"
|
| #include "content/public/common/gpu_memory_stats.h"
|
| #include "gpu/command_buffer/common/command_buffer.h"
|
| #include "gpu/command_buffer/common/constants.h"
|
| +#include "gpu/config/gpu_info.h"
|
| #include "gpu/ipc/gpu_command_buffer_traits.h"
|
| #include "ipc/ipc_channel_handle.h"
|
| #include "ipc/ipc_message_macros.h"
|
| @@ -108,25 +108,25 @@
|
| IPC_STRUCT_END()
|
| #endif
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(content::DxDiagNode)
|
| + IPC_STRUCT_TRAITS_BEGIN(gpu::DxDiagNode)
|
| IPC_STRUCT_TRAITS_MEMBER(values)
|
| IPC_STRUCT_TRAITS_MEMBER(children)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(content::GpuPerformanceStats)
|
| +IPC_STRUCT_TRAITS_BEGIN(gpu::GpuPerformanceStats)
|
| IPC_STRUCT_TRAITS_MEMBER(graphics)
|
| IPC_STRUCT_TRAITS_MEMBER(gaming)
|
| IPC_STRUCT_TRAITS_MEMBER(overall)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(content::GPUInfo::GPUDevice)
|
| +IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo::GPUDevice)
|
| IPC_STRUCT_TRAITS_MEMBER(vendor_id)
|
| IPC_STRUCT_TRAITS_MEMBER(device_id)
|
| IPC_STRUCT_TRAITS_MEMBER(vendor_string)
|
| IPC_STRUCT_TRAITS_MEMBER(device_string)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| -IPC_STRUCT_TRAITS_BEGIN(content::GPUInfo)
|
| +IPC_STRUCT_TRAITS_BEGIN(gpu::GPUInfo)
|
| IPC_STRUCT_TRAITS_MEMBER(finalized)
|
| IPC_STRUCT_TRAITS_MEMBER(initialization_time)
|
| IPC_STRUCT_TRAITS_MEMBER(optimus)
|
| @@ -299,7 +299,7 @@
|
| content::CauseForGpuLaunch,
|
| int /* client id */,
|
| IPC::ChannelHandle /* handle to channel */,
|
| - content::GPUInfo /* stats about GPU process*/)
|
| + gpu::GPUInfo /* stats about GPU process*/)
|
|
|
| // A renderer sends this to the browser process when it wants to
|
| // create a GL context associated with the given view_id.
|
| @@ -345,7 +345,7 @@
|
|
|
| // Response from GPU to a GpuMsg_CollectGraphicsInfo.
|
| IPC_MESSAGE_CONTROL1(GpuHostMsg_GraphicsInfoCollected,
|
| - content::GPUInfo /* GPU logging stats */)
|
| + gpu::GPUInfo /* GPU logging stats */)
|
|
|
| // Response from GPU to a GpuMsg_GetVideoMemory.
|
| IPC_MESSAGE_CONTROL1(GpuHostMsg_VideoMemoryUsageStats,
|
|
|