| Index: content/common/gpu/gpu_messages.h
|
| diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
|
| index f8b854979da2c3c98175f9c03ed1cb2964e395be..47d3aeb5140a9e2c100797076222a012b1d13a21 100644
|
| --- a/content/common/gpu/gpu_messages.h
|
| +++ b/content/common/gpu/gpu_messages.h
|
| @@ -9,7 +9,6 @@
|
| #include <vector>
|
|
|
| #include "base/shared_memory.h"
|
| -#include "cc/debug/latency_info.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/gpu/gpu_memory_allocation.h"
|
| #include "content/common/gpu/gpu_memory_uma_stats.h"
|
| @@ -24,6 +23,7 @@
|
| #include "ipc/ipc_channel_handle.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "media/video/video_decode_accelerator.h"
|
| +#include "ui/base/latency_info.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/size.h"
|
| #include "ui/gl/gpu_preference.h"
|
| @@ -51,7 +51,7 @@ IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params)
|
| IPC_STRUCT_MEMBER(int32, route_id)
|
| IPC_STRUCT_MEMBER(std::string, mailbox_name)
|
| IPC_STRUCT_MEMBER(gfx::Size, size)
|
| - IPC_STRUCT_MEMBER(cc::LatencyInfo, latency_info)
|
| + IPC_STRUCT_MEMBER(ui::LatencyInfo, latency_info)
|
| IPC_STRUCT_END()
|
| #undef IPC_MESSAGE_EXPORT
|
| #define IPC_MESSAGE_EXPORT
|
| @@ -66,7 +66,7 @@ IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params)
|
| IPC_STRUCT_MEMBER(int, height)
|
| IPC_STRUCT_MEMBER(std::string, mailbox_name)
|
| IPC_STRUCT_MEMBER(gfx::Size, surface_size)
|
| - IPC_STRUCT_MEMBER(cc::LatencyInfo, latency_info)
|
| + IPC_STRUCT_MEMBER(ui::LatencyInfo, latency_info)
|
| IPC_STRUCT_END()
|
|
|
| IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceRelease_Params)
|
| @@ -367,7 +367,7 @@ IPC_MESSAGE_CONTROL3(GpuHostMsg_ResizeView,
|
| // Tells the browser that a frame with the specific latency info was drawn to
|
| // the screen
|
| IPC_MESSAGE_CONTROL1(GpuHostMsg_FrameDrawn,
|
| - cc::LatencyInfo /* latency_info */)
|
| + ui::LatencyInfo /* latency_info */)
|
|
|
| // Same as above with a rect of the part of the surface that changed.
|
| IPC_MESSAGE_CONTROL1(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
|
| @@ -513,7 +513,7 @@ IPC_MESSAGE_ROUTED2(GpuCommandBufferMsg_AsyncFlush,
|
| // Sends information about the latency of the current frame to the GPU
|
| // process.
|
| IPC_MESSAGE_ROUTED1(GpuCommandBufferMsg_SetLatencyInfo,
|
| - cc::LatencyInfo /* latency_info */)
|
| + ui::LatencyInfo /* latency_info */)
|
|
|
| // Asynchronously process any commands known to the GPU process. This is only
|
| // used in the event that a channel is unscheduled and needs to be flushed
|
|
|