| Index: content/common/gpu/client/command_buffer_proxy_impl.h
|
| diff --git a/content/common/gpu/client/command_buffer_proxy_impl.h b/content/common/gpu/client/command_buffer_proxy_impl.h
|
| index ffbf9b63226493ffda47b1a5f0cbfe1f95d57186..418fe25abd82a8ed4f21d44f9db4b35c830f31ba 100644
|
| --- a/content/common/gpu/client/command_buffer_proxy_impl.h
|
| +++ b/content/common/gpu/client/command_buffer_proxy_impl.h
|
| @@ -24,6 +24,7 @@
|
| #include "gpu/command_buffer/common/command_buffer.h"
|
| #include "gpu/command_buffer/common/command_buffer_shared.h"
|
| #include "ipc/ipc_listener.h"
|
| +#include "webkit/compositor_bindings/web_latency_info_impl.h"
|
|
|
| struct GPUCommandBufferConsoleMessage;
|
|
|
| @@ -43,6 +44,8 @@ class CommandBufferProxyImpl
|
| public:
|
| typedef base::Callback<void(
|
| const std::string& msg, int id)> GpuConsoleMessageCallback;
|
| + typedef base::Callback<void(
|
| + const cc::LatencyInfo&)> GpuLatencyInfoCallback;
|
|
|
| CommandBufferProxyImpl(GpuChannelHost* channel, int route_id);
|
| virtual ~CommandBufferProxyImpl();
|
| @@ -120,6 +123,10 @@ class CommandBufferProxyImpl
|
| void SetOnConsoleMessageCallback(
|
| const GpuConsoleMessageCallback& callback);
|
|
|
| + void SetLatencyInfo(const cc::LatencyInfo& latency_info);
|
| +
|
| + void SetLatencyInfoCallback(const GpuLatencyInfoCallback& callback);
|
| +
|
| // TODO(apatrick): this is a temporary optimization while skia is calling
|
| // ContentGLContext::MakeCurrent prior to every GL call. It saves returning 6
|
| // ints redundantly when only the error is needed for the
|
| @@ -148,6 +155,7 @@ class CommandBufferProxyImpl
|
| void OnSetMemoryAllocation(const GpuMemoryAllocationForRenderer& allocation);
|
| void OnSignalSyncPointAck(uint32 id);
|
| void OnGenerateMailboxNamesReply(const std::vector<std::string>& names);
|
| + void OnSetLatencyInfo(const cc::LatencyInfo& latency_info);
|
|
|
| // Try to read an updated copy of the state from shared memory.
|
| void TryUpdateState();
|
| @@ -188,6 +196,8 @@ class CommandBufferProxyImpl
|
|
|
| GpuConsoleMessageCallback console_message_callback_;
|
|
|
| + GpuLatencyInfoCallback latency_info_callback_;
|
| +
|
| // Tasks to be invoked in SignalSyncPoint responses.
|
| uint32 next_signal_id_;
|
| SignalTaskMap signal_tasks_;
|
|
|