Index: content/browser/gpu/gpu_process_host.cc |
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc |
index 29d914efab8ac314cccd3228a6110dc37e7e7bf3..c694cdcde447e6ca9a9bfa3a690eef3ec71f3d68 100644 |
--- a/content/browser/gpu/gpu_process_host.cc |
+++ b/content/browser/gpu/gpu_process_host.cc |
@@ -6,8 +6,9 @@ |
#include "base/base64.h" |
#include "base/base_switches.h" |
+#include "base/basictypes.h" |
#include "base/bind.h" |
-#include "base/bind_helpers.h" |
+#include "base/callback_helpers.h" |
#include "base/command_line.h" |
#include "base/debug/trace_event.h" |
#include "base/logging.h" |
@@ -900,7 +901,7 @@ void GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped( |
// if the browser is waiting for a new frame. Otherwise the RenderWidgetHelper |
// will forward to the RenderWidgetHostView via RenderProcessHostImpl and |
// RenderWidgetHostImpl. |
- scoped_completion_runner.Release(); |
+ ignore_result(scoped_completion_runner.Release()); |
ViewHostMsg_CompositorSurfaceBuffersSwapped_Params view_params; |
view_params.surface_id = params.surface_id; |
@@ -936,7 +937,7 @@ void GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped( |
TRACE_EVENT1("gpu", "SurfaceIDNotFound_RoutingToUI", |
"surface_id", params.surface_id); |
// This is a content area swap, send it on to the UI thread. |
- scoped_completion_runner.Release(); |
+ ignore_result(scoped_completion_runner.Release()); |
RouteOnUIThread(GpuHostMsg_AcceleratedSurfaceBuffersSwapped(params)); |
return; |
} |
@@ -950,7 +951,7 @@ void GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped( |
"EarlyOut_NativeWindowNotFound", |
"handle", |
handle.handle); |
- scoped_completion_runner.Release(); |
+ ignore_result(scoped_completion_runner.Release()); |
AcceleratedSurfaceBuffersSwappedCompleted(host_id_, |
params.route_id, |
params.surface_id, |
@@ -961,7 +962,7 @@ void GpuProcessHost::OnAcceleratedSurfaceBuffersSwapped( |
return; |
} |
- scoped_completion_runner.Release(); |
+ ignore_result(scoped_completion_runner.Release()); |
presenter->AsyncPresentAndAcknowledge( |
params.size, |
params.surface_handle, |