| Index: content/browser/gpu/gpu_process_host_ui_shim.cc
|
| diff --git a/content/browser/gpu/gpu_process_host_ui_shim.cc b/content/browser/gpu/gpu_process_host_ui_shim.cc
|
| index f50db216e35c78f15911fd99e2d8e8ebfe668056..39aaa6ebd623b317bf7f419362fd6848b9573435 100644
|
| --- a/content/browser/gpu/gpu_process_host_ui_shim.cc
|
| +++ b/content/browser/gpu/gpu_process_host_ui_shim.cc
|
| @@ -22,7 +22,7 @@
|
| #include "content/browser/renderer_host/render_view_host_impl.h"
|
| #include "content/browser/renderer_host/render_widget_helper.h"
|
| #include "content/browser/renderer_host/render_widget_host_view_base.h"
|
| -#include "content/common/gpu/gpu_messages.h"
|
| +#include "content/common/gpu/gpu_browser_messages.h"
|
| #include "content/public/browser/browser_thread.h"
|
|
|
| #if defined(OS_MACOSX)
|
| @@ -184,8 +184,7 @@ bool GpuProcessHostUIShim::OnControlMessageReceived(
|
| DCHECK(CalledOnValidThread());
|
|
|
| IPC_BEGIN_MESSAGE_MAP(GpuProcessHostUIShim, message)
|
| - IPC_MESSAGE_HANDLER(GpuHostMsg_OnLogMessage,
|
| - OnLogMessage)
|
| + IPC_MESSAGE_HANDLER(GpuHostMsg_OnLogMessage, OnLogMessage)
|
| #if defined(OS_MACOSX)
|
| IPC_MESSAGE_HANDLER(GpuHostMsg_AcceleratedSurfaceBuffersSwapped,
|
| OnAcceleratedSurfaceBuffersSwapped)
|
| @@ -227,7 +226,6 @@ void GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped(
|
| "GpuProcessHostUIShim::OnAcceleratedSurfaceBuffersSwapped");
|
| if (!ui::LatencyInfo::Verify(params.latency_info,
|
| "GpuHostMsg_AcceleratedSurfaceBuffersSwapped")) {
|
| -
|
| TRACE_EVENT0("browser", "ui::LatencyInfo::Verify failed");
|
| return;
|
| }
|
|
|